feat(build): use ~= and >= package constraints (runatlantis#2896)

* Pin dependencies using ~= and >= * Use atlantis-base:latest * Add schedules for atlantis-base and atlantis-image gha * Update Dockerfile * Update atlantis-image.yml * Update atlantis-base.yml
vincentgna · Jan 9, 2023 · 5715f3d · 5715f3d
1 parent e4473ce
commit 5715f3d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/docker-base/Dockerfile.alpine b/docker-base/Dockerfile.alpine
@@ -26,19 +26,19 @@ ARG TARGETPLATFORM
 
 # Install packages needed for running Atlantis.
 RUN apk add --no-cache \
-        ca-certificates=20220614-r3 \
-        curl=7.87.0-r0 \
-        git=2.38.2-r0 \
-        unzip=6.0-r13 \
-        bash=5.2.15-r0 \
-        openssh=9.1_p1-r1 \
-        libcap=2.66-r0 \
-        dumb-init=1.2.5-r2 \
-        gcompat=1.1.0-r0 && \
+        ca-certificates~=20220614 \
+        curl~=7.87 \
+        git~=2.38 \
+        unzip~=6.0 \
+        bash~=5.2 \
+        openssh~=9.1_p1 \
+        libcap~=2.66 \
+        dumb-init~=1.2 \
+        gcompat~=1.1 && \
     # Install packages needed for building dependencies.
     apk add --no-cache --virtual .build-deps \
-        gnupg=2.2.40-r0 \
-        openssl=3.0.7-r0 && \
+        gnupg~=2.2 \
+        openssl~=3.0 && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     # git-lfs

diff --git a/docker-base/Dockerfile.debian b/docker-base/Dockerfile.debian
@@ -23,20 +23,24 @@ ENV GIT_LFS_VERSION=3.3.0
 ARG TARGETPLATFORM
 
 # Install packages needed for running Atlantis.
+# hadolint ignore explanation
+# DL3008 (pin versions using "=") - Ignored to avoid failing the build
+# SC2261 (multiple redirections) - This is a bug https://github.com/hadolint/hadolint/issues/782
+# hadolint ignore=DL3008,SC2261
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u3 \
-        git=1:2.30.2-1 \
-        unzip=6.0-26+deb11u1 \
-        bash=5.1-2+deb11u1 \
-        openssh-server=1:8.4p1-5+deb11u1 \
-        libcap2=1:2.44-1 \
-        dumb-init=1.2.5-1 \
+        ca-certificates>=20210119 \
+        curl>=7.74 \
+        git>=1:2.30 \
+        unzip>=6.0 \
+        bash>=5.1 \
+        openssh-server>=1:8.4p1 \
+        libcap2>=1:2.44 \
+        dumb-init>=1.2 \
     # Install packages needed for building dependencies.
     && apt-get install -y --no-install-recommends \
-        gnupg=2.2.27-2+deb11u2 \
-        openssl=1.1.1n-0+deb11u3 && \
+        gnupg>=2.2 \
+        openssl>=1.1.1n && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     # git-lfs