DXE-3869 Merge pull request #124 from akamai/release/v2.24.0

DXE-3869 Release/v2.24.0
akamai · Jul 17, 2024 · f383c99 · f383c99
2 parents fa1371f + 30222d5
commit f383c99
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,6 @@
 
 ## 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)

diff --git a/dockerfiles/api-gateway.Dockerfile b/dockerfiles/api-gateway.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:1.21-alpine3.20 as builder
+FROM golang:1.18-alpine 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:18-alpine3.20 as builder
+FROM node:12-alpine3.13 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.20
+ARG BASE=alpine:3.13
 
 #####################
 # FINAL

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

diff --git a/dockerfiles/dns.Dockerfile b/dockerfiles/dns.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM golang:alpine3.20 as builder
+FROM golang:alpine3.13 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:14-alpine3.17 as builder
+FROM node:12-alpine3.13 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.20 as builder
+FROM golang:alpine3.13 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,20 +27,13 @@ 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 \
-  # 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 \
+  && pip3 install --upgrade pip setuptools \
+  && pip3 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.20 as jsonnet
+FROM golang:alpine3.13 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/property-manager.Dockerfile b/dockerfiles/property-manager.Dockerfile
@@ -22,7 +22,7 @@ ARG BASE=akamai/base
 # BUILDER
 #########
 
-FROM node:18-alpine3.20 as builder
+FROM node:12-alpine3.13 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.20 as builder
+FROM golang:alpine3.17 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.20 as builder
+FROM node:18-alpine3.17 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.20 as builder
+FROM golang:alpine3.17 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.20 as builder
+FROM alpine:3.13 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.20 as builder
+FROM golang:alpine3.17 as builder
 
 # this will only be used on architectures that upx doesn't use
 COPY files/upx-noop /usr/bin/upx

diff --git a/test.bats b/test.bats
@@ -34,12 +34,12 @@
   [ "$status" -eq 0 ]
 }
 
-@test "cli: adaptive-acceleration is executable" {
-  # A2 does not have a --help
-  run akamai adaptive-acceleration
-  [ "$status" -eq 1 ]
-  [[ "$output" =~ "ERROR: missing adaptive-acceleration command." ]]
-}
+# @test "cli: adaptive-acceleration is executable" {
+#  # A2 does not have a --help
+#  run akamai adaptive-acceleration
+#  [ "$status" -eq 1 ]
+#  [[ "$output" =~ "ERROR: missing adaptive-acceleration command." ]]
+# }
 
 @test "cli: api-gateway: api-gateway is executable" {
   run akamai api-gateway --help
@@ -97,10 +97,10 @@
   [ "$status" -eq 0 ]
 }
 
-@test "cli: image-manager is executable" {
-  run akamai image-manager --help
-  [ "$status" -eq 0 ]
-}
+# @test "cli: image-manager is executable" {
+#  run akamai image-manager --help
+#  [ "$status" -eq 0 ]
+# }
 
 @test "cli: jsonnet is executable" {
   run akamai jsonnet --help