move to docker (super-linter#2176)

23andMe · May 6, 2022 · ec775f1 · ec775f1
1 parent e16da4e
commit ec775f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,7 @@ FROM garethr/kubeval:0.15.0 as kubeval
 FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib
 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
 FROM scalameta/scalafmt:v3.1.0 as scalafmt
+FROM rhysd/actionlint:1.6.8 as actionlint
 
 ##################
 # Get base image #
@@ -143,14 +144,6 @@ RUN pip3 install --no-cache-dir pipenv \
 # Installs Perl dependencies #
 ##############################
 RUN curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wget Perl::Critic \
-#######################
-# Installs ActionLint #
-#######################
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash \
-    && chmod +x download-actionlint.bash \
-    && ./download-actionlint.bash \
-    && rm download-actionlint.bash \
-    && mv actionlint /usr/bin/actionlint \
 #########################################
 # Install Powershell + PSScriptAnalyzer #
 #########################################
@@ -260,6 +253,11 @@ COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
 ####################
 COPY --from=scalafmt /bin/scalafmt /usr/bin/
 
+######################
+# Install actionlint #
+######################
+COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
+
 #################
 # Install Litnr #
 #################

diff --git a/Dockerfile-slim b/Dockerfile-slim
@@ -30,6 +30,7 @@ FROM garethr/kubeval:0.15.0 as kubeval
 FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib
 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
 FROM scalameta/scalafmt:v3.1.0 as scalafmt
+FROM rhysd/actionlint:1.6.8 as actionlint
 
 ##################
 # Get base image #
@@ -113,14 +114,7 @@ RUN curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wge
 # Install Python Black #
 ########################
     && wget --tries=5 -q -O /usr/local/bin/black https://github.com/psf/black/releases/download/21.11b1/black_linux \
-    && chmod +x /usr/local/bin/black \
-#######################
-# Installs ActionLint #
-#######################
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash \
-    && chmod +x download-actionlint.bash \
-    && ./download-actionlint.bash \
-    && mv actionlint /usr/bin/actionlint
+    && chmod +x /usr/local/bin/black
 
 ######################
 # Install shellcheck #
@@ -198,6 +192,11 @@ COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
 ####################
 COPY --from=scalafmt /bin/scalafmt /usr/bin/
 
+######################
+# Install actionlint #
+######################
+COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
+
 #################
 # Install Litnr #
 #################