DXE-4218 Merge pull request #126 from akamai/release/v2.26.0

Release/v2.26.0
akamai · Oct 14, 2024 · b771800 · b771800
2 parents 7303ee2 + 033307b
commit b771800
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v2.26.0 (2024-10-14)
+
+* DXE-3346 Upgrade alpine to 3.19 for `base`.
+  * Upgraded node version to `node:18-alpine3.19` for `appsec`, `edgeworkers`, `sandbox`, `property-manager`.
+  * Upgraded go version to `1.21` for `dns`,`cli`,`gtm`,`jsonnet`,`purge`,`terraform-cli`,`test-center`,`api-gateway`.
+  * Added python virtual environment in `httpie` to support alpine3.19.
+  * Upgraded alpine version to `alpine:3.19` for `terraform`.
+  * Restored using the latest versions of the `onboard` and `cloudlets` packages.
+* DXE-4218 Upgrade akamai terraform provider to v6.5.0
+
 ## v2.25.0 (2024-09-05)
 
 * DXE-4064 Change locally built images tags to `local-amd64` or `local-arm64`

diff --git a/dockerfiles/api-gateway.Dockerfile b/dockerfiles/api-gateway.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:1.18-alpine as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/appsec.Dockerfile b/dockerfiles/appsec.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM node:12-alpine3.13 as builder
+FROM node:18-alpine3.19 as builder
 
 RUN apk add --no-cache git npm \
   # install cli-appsec from git

diff --git a/dockerfiles/base.Dockerfile b/dockerfiles/base.Dockerfile
@@ -16,7 +16,7 @@
 # BUILD ARGS
 #########
 
-ARG BASE=alpine:3.13
+ARG BASE=alpine:3.19
 
 #####################
 # FINAL

diff --git a/dockerfiles/cli.Dockerfile b/dockerfiles/cli.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.17 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 ARG CLI_REPOSITORY_URL=https://github.com/akamai/cli
 

diff --git a/dockerfiles/cloudlets.Dockerfile b/dockerfiles/cloudlets.Dockerfile
@@ -28,12 +28,10 @@ RUN mkdir -p /cli/.akamai-cli/src \
   && apk add --no-cache python3 py3-pip \
   && apk add --no-cache --virtual dev git gcc python3-dev py3-setuptools libffi-dev musl-dev openssl-dev \
   && git clone https://github.com/akamai/cli-cloudlets.git /cli/.akamai-cli/src/cli-cloudlets \
-  # Currently Akamai Docker cannot be build using the latest changes in cli-cloudlets that require Pandas library
-  && git -C /cli/.akamai-cli/src/cli-cloudlets checkout 98d949d7c81a1b25bf1555bf2c3e59f6504efb54 \
   && python3 -m venv /cli/.akamai-cli/venv/cli-cloudlets \
   && source /cli/.akamai-cli/venv/cli-cloudlets/bin/activate \
   && python -m pip install --upgrade pip \
-  && python -m pip install -r /cli/.akamai-cli/src/cli-cloudlets/requirements.txt \
+  && python -m pip install --only-binary :all: -r /cli/.akamai-cli/src/cli-cloudlets/requirements.txt \
   && deactivate \
   # Drop dev dependencies
   && apk del dev \

diff --git a/dockerfiles/dns.Dockerfile b/dockerfiles/dns.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.13 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/edgeworkers.Dockerfile b/dockerfiles/edgeworkers.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM node:12-alpine3.13 as builder
+FROM node:18-alpine3.19 as builder
 
 RUN apk add --no-cache git npm \
   # install cli-edgeworkers from git

diff --git a/dockerfiles/gtm.Dockerfile b/dockerfiles/gtm.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.13 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/httpie.Dockerfile b/dockerfiles/httpie.Dockerfile
@@ -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 \
+  # 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
diff --git a/dockerfiles/jsonnet.Dockerfile b/dockerfiles/jsonnet.Dockerfile
@@ -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:1.21.12-alpine3.19 as jsonnet
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/onboard.Dockerfile b/dockerfiles/onboard.Dockerfile
@@ -28,12 +28,10 @@ RUN mkdir -p /cli/.akamai-cli/src \
   && apk add --no-cache python3 py3-pip \
   && apk add --no-cache --virtual dev git gcc python3-dev py3-setuptools libffi-dev musl-dev openssl-dev \
   && git clone https://github.com/akamai/cli-onboard.git /cli/.akamai-cli/src/cli-onboard \
-  # Currently Akamai Docker cannot be build using the latest changes in cli-onboard that require Pandas library
-  && git -C /cli/.akamai-cli/src/cli-onboard checkout 7c0a2caaa7c2a41b0a9b6ec80d60c817334349b5 \
   && python3 -m venv /cli/.akamai-cli/venv/cli-onboard \
   && source /cli/.akamai-cli/venv/cli-onboard/bin/activate \
   && python -m pip install --upgrade pip \
-  && python -m pip install -r /cli/.akamai-cli/src/cli-onboard/requirements.txt \
+  && python -m pip install --only-binary :all: -r /cli/.akamai-cli/src/cli-onboard/requirements.txt \
   && deactivate \
   # Drop dev dependencies
   && apk del dev \

diff --git a/dockerfiles/property-manager.Dockerfile b/dockerfiles/property-manager.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM node:12-alpine3.13 as builder
+FROM node:18-alpine3.19 as builder
 
 RUN apk add --no-cache git npm \
   # install cli-property-manager from git

diff --git a/dockerfiles/purge.Dockerfile b/dockerfiles/purge.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.17 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/sandbox.Dockerfile b/dockerfiles/sandbox.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/cli
 # BUILDER
 #########
 
-FROM node:18-alpine3.17 as builder
+FROM node:18-alpine3.19 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

diff --git a/dockerfiles/terraform-cli.Dockerfile b/dockerfiles/terraform-cli.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.17 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/dockerfiles/terraform.Dockerfile b/dockerfiles/terraform.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM alpine:3.13 as builder
+FROM alpine:3.19 as builder
 ARG TERRAFORM_VERSION=1.4.6
 ARG TERRAFORM_SHA256SUM_amd64=e079db1a8945e39b1f8ba4e513946b3ab9f32bd5a2bdf19b9b186d22c5a3d53b
 ARG TERRAFORM_SHA256SUM_arm64=b38f5db944ac4942f11ceea465a91e365b0636febd9998c110fbbe95d61c3b26

diff --git a/dockerfiles/test-center.Dockerfile b/dockerfiles/test-center.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.17 as builder
+FROM golang:1.21.12-alpine3.19 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/files/terraform.tf b/files/terraform.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source = "akamai/akamai"
-      version = "6.4.0"
+      version = "6.5.0"
     }
 
     null = {