Merge pull request #123 from for-GET/slim

for-GET · May 7, 2022 · 29403dc · 29403dc
2 parents 878be0a + 3e96ae0
commit 29403dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,21 +19,21 @@ jobs:
       fail-fast: false
       matrix:
         otp_vsn:
-          - 'latest'
-          - '24.2'
-          - '24.1'
-          - '24.0'
-          - '23.3'
-          - '23.2'
-          - '23.1'
-          - '23'
-          - '22.3'
-          - '22.2'
-          - '22.1'
-          - '22'
-          - '21.3'
-          - '20.3'
-          - '19.3'
+          - 'slim'
+          - '24.2-slim'
+          - '24.1-slim'
+          - '24.0-slim'
+          - '23.3-slim'
+          - '23.2-slim'
+          - '23.1-slim'
+          - '23-slim'
+          - '22.3-slim'
+          - '22.2-slim'
+          - '22.1-slim'
+          - '22-slim'
+          - '21.3-slim'
+          - '20.3-slim'
+          - '19.3-slim'
     name: 'ci-erl:${{ matrix.otp_vsn }}'
     runs-on: ubuntu-latest
     container:
@@ -43,7 +43,8 @@ jobs:
         run: |
           # manually sync with ./Dockerfile.build.sh
           apt-get update
-          apt-get -y install tcl tcl-dev gettext
+          apt-get -y install wget
+          apt-get -y install libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext cmake gcc
           cd /usr/src/
           wget https://github.com/git/git/archive/v2.18.0.tar.gz -O git.tar.gz
           tar -xf git.tar.gz

diff --git a/Dockerfile.build.sh b/Dockerfile.build.sh
@@ -3,7 +3,8 @@ set -euo pipefail
 
 # manually sync with ./.github/workflows/ci.yml
 apt-get update
-apt-get -y install tcl tcl-dev gettext
+apt-get -y install wget
+apt-get -y install libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext cmake gcc
 cd /usr/src/
 wget https://github.com/git/git/archive/v2.18.0.tar.gz -O git.tar.gz
 tar -xf git.tar.gz

diff --git a/Makefile b/Makefile
@@ -178,6 +178,6 @@ docker-force:
     --platform linux/amd64,linux/arm64 \
 		--tag ysoftwareab/jesse:$(GIT_DESCRIBE) \
 		--tag ysoftwareab/jesse:latest \
-		--build-arg FROM=erlang:latest \
+		--build-arg FROM=erlang:slim \
 		--build-arg LABEL_VCS_REF=$$(git rev-parse HEAD) \
 		--build-arg LABEL_BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ")