Run build.sh

oxsecurity · Feb 11, 2023 · 7bd3c3a · 7bd3c3a
1 parent fea4ce0
commit 7bd3c3a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -322,7 +322,8 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 ENV PATH="$JAVA_HOME/bin:${PATH}"
 
 # PHP installation
-RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
+RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
+    && wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
     && wget --tries=5 -q -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
     && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \
     && ( gpg --keyserver keyserver.pgp.com --recv-keys "$PHAR_KEY_ID" \
@@ -499,13 +500,13 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
     && curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wget Perl::Critic \
 
 # phpcs installation
-    && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
 
 # phpstan installation
-    && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
 
 # psalm installation
-    && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
 
 # phplint installation
     && composer global require --ignore-platform-reqs overtrue/phplint ^5.3 \

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -265,7 +265,8 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 ENV PATH="$JAVA_HOME/bin:${PATH}"
 
 # PHP installation
-RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
+RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
+    && wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
     && wget --tries=5 -q -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
     && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \
     && ( gpg --keyserver keyserver.pgp.com --recv-keys "$PHAR_KEY_ID" \
@@ -362,13 +363,13 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c
     && chmod 755 /usr/local/bin/checkmake \
 
 # phpcs installation
-    && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
 
 # phpstan installation
-    && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
 
 # psalm installation
-    && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
 
 # phplint installation
     && composer global require --ignore-platform-reqs overtrue/phplint ^5.3 \

diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
@@ -215,7 +215,8 @@ COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
 #############################################################################################
 #OTHER__START
 # PHP installation
-RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
+RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
+    && wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
     && wget --tries=5 -q -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
     && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \
     && ( gpg --keyserver keyserver.pgp.com --recv-keys "$PHAR_KEY_ID" \
@@ -282,13 +283,13 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c
     && find ${ML_THIRD_PARTY_DIR} -type f -not -name 'LICENSE*' -delete -o -type d -empty -delete \
 
 # phpcs installation
-    && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192 \
 
 # phpstan installation
-    && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720 \
 
 # psalm installation
-    && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
+    && export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5 \
 
 # phplint installation
     && composer global require --ignore-platform-reqs overtrue/phplint ^5.3 \

diff --git a/linters/php_psalm/Dockerfile b/linters/php_psalm/Dockerfile
@@ -134,7 +134,8 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
 #############################################################################################
 #OTHER__START
 # PHP installation
-RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
+RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
+    && wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
     && wget --tries=5 -q -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
     && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \
     && ( gpg --keyserver keyserver.pgp.com --recv-keys "$PHAR_KEY_ID" \
@@ -150,7 +151,7 @@ RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
 ENV PATH="/root/.composer/vendor/bin:$PATH"
 
 # psalm installation
-RUN phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5
+RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5
 
 
 #OTHER__END

diff --git a/megalinter/descriptors/php.megalinter-descriptor.yml b/megalinter/descriptors/php.megalinter-descriptor.yml
@@ -21,7 +21,6 @@ install:
     - dpkg
   dockerfile:
     - |
-      ARG GITHUB_AUTH_TOKEN
       RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
           && wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
           && wget --tries=5 -q -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
@@ -54,7 +53,6 @@ linters:
     install:
       dockerfile:
         - |
-          ARG GITHUB_AUTH_TOKEN
           RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpcs -g --trust-gpg-keys 31C7E470E2138192
     ide:
       atom:
@@ -99,7 +97,6 @@ linters:
     install:
       dockerfile:
         - |
-          ARG GITHUB_AUTH_TOKEN
           RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install phpstan -g --trust-gpg-keys CF1A108D0E7AE720
     ide:
       idea:
@@ -134,7 +131,6 @@ linters:
     install:
       dockerfile:
         - |
-          ARG GITHUB_AUTH_TOKEN
           RUN export GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" && phive --no-progress install psalm -g --trust-gpg-keys 8A03EA3B385DBAA1,12CE0F1D262429A5
     ide:
       idea: