Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DXE-3869 Release/v2.24.0 #122

Merged
merged 6 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# CHANGELOG

## v2.24.0 (2024-07-17)

* DXE-3346 Upgrade alpine to 3.20 for `base`.
* Upgraded node version to node:18-alpine3.20 for `appsec`, `sandbox`.
* Upgraded node version to node:12-alpine3.20 for `property-manager`.
* Upgraded node version to node:14-alpine3.17 for `edgeworkers`.
* Upgraded go version to golang:alpine3.20 for `dns`,`cli`,`gtm`,`jsonnet`,`purge`,`terraform-cli`,`test-center`.
* Added python virtual environment in `httpie` to support alpine3.20.
* Upgraded go version to golang:1.21-alpine3.20 for `api-gateway`.
* Upgraded alpine version to alpine:3.20 for `terraform`.
* DXE-3869 Upgrade akamai terraform provider to v6.3.0

## v2.23.0 (2024-05-29)

* DXE-3855 Upgrade akamai terraform provider to v6.2.0
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/api-gateway.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:1.18-alpine as builder
FROM golang:1.21-alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/appsec.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM node:12-alpine3.13 as builder
FROM node:18-alpine3.20 as builder

RUN apk add --no-cache git npm \
# install cli-appsec from git
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# BUILD ARGS
#########

ARG BASE=alpine:3.13
ARG BASE=alpine:3.20

#####################
# FINAL
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cli.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.17 as builder
FROM golang:alpine3.20 as builder

ARG CLI_REPOSITORY_URL=https://github.com/akamai/cli

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/dns.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.13 as builder
FROM golang:alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/edgeworkers.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM node:12-alpine3.13 as builder
FROM node:14-alpine3.17 as builder

RUN apk add --no-cache git npm \
# install cli-edgeworkers from git
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/gtm.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.13 as builder
FROM golang:alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
13 changes: 10 additions & 3 deletions dockerfiles/httpie.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,20 @@ FROM ${BASE}
# httpie depends on setuptools at runtime
RUN apk add --no-cache python3 py3-pip py3-setuptools \
&& apk add --no-cache --virtual dev git gcc python3-dev libffi-dev musl-dev openssl-dev \
&& pip3 install --upgrade pip setuptools \
&& pip3 install httpie httpie-edgegrid \
# Drop dev dependencies
# Create a virtual environment
&& python3 -m venv /venv \
# Activate the virtual environment \
&& . /venv/bin/activate \
&& pip install --upgrade pip setuptools \
&& pip install httpie httpie-edgegrid \
# Drop dev dependencies \
&& apk del dev \
# Drop created wheels
&& rm -rf /workdir/.cache \
# Drop ~20MB by removing bytecode cache created by pip
&& find / -name __pycache__ | xargs rm -rf

# Set the virtual environment as the default Python environment
ENV PATH="/venv/bin:$PATH"

ADD files/httpie-config.json /workdir/.httpie/config.json
2 changes: 1 addition & 1 deletion dockerfiles/jsonnet.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ARG BASE=akamai/base
# image since it is likely that the user will want to render the
# templates, not just generate them.

FROM golang:alpine3.13 as jsonnet
FROM golang:alpine3.20 as jsonnet

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/property-manager.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM node:12-alpine3.13 as builder
FROM node:18-alpine3.20 as builder

RUN apk add --no-cache git npm \
# install cli-property-manager from git
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/purge.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.17 as builder
FROM golang:alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/sandbox.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/cli
# BUILDER
#########

FROM node:18-alpine3.17 as builder
FROM node:18-alpine3.20 as builder

# sandbox originally binds to 127.0.0.1 which doesn't work with Docker's port mapping
# the patch changes the ip to 0.0.0.0
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/terraform-cli.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.17 as builder
FROM golang:alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/terraform.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM alpine:3.13 as builder
FROM alpine:3.20 as builder
ARG TERRAFORM_VERSION=1.4.6
ARG TERRAFORM_SHA256SUM_amd64=e079db1a8945e39b1f8ba4e513946b3ab9f32bd5a2bdf19b9b186d22c5a3d53b
ARG TERRAFORM_SHA256SUM_arm64=b38f5db944ac4942f11ceea465a91e365b0636febd9998c110fbbe95d61c3b26
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/test-center.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG BASE=akamai/base
# BUILDER
#########

FROM golang:alpine3.17 as builder
FROM golang:alpine3.20 as builder

# this will only be used on architectures that upx doesn't use
COPY files/upx-noop /usr/bin/upx
Expand Down
2 changes: 1 addition & 1 deletion files/terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
akamai = {
source = "akamai/akamai"
version = "6.2.0"
version = "6.3.0"
}

null = {
Expand Down