cleared all linter findings

mriedmann · Sep 1, 2021 · 5a7ffad · 5a7ffad
1 parent 7e9c254
commit 5a7ffad
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 67 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,17 +19,18 @@ jobs:
     - uses: FranzDiebold/[email protected]
     - name: Set Humhub version
       run: |
-        export HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
-        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> $GITHUB_ENV
+        HUMHUB_VERSION="$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)"
+        export HUMHUB_VERSION
+        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> "$GITHUB_ENV"
     - name: Build and push docker image
       run: |
         docker build \
           --build-arg HUMHUB_VERSION="${HUMHUB_VERSION}" \
-          --build-arg VCS_REF=`git rev-parse --short HEAD` \
+          --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
           --target base \
-          -t ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-base\
+          -t "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-base" \
           .
-        docker save ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-base | gzip > build-${{ matrix.version }}.tar.gz
+        docker save "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-base" | gzip > build-${{ matrix.version }}.tar.gz
     - name: Upload image archive
       uses: actions/upload-artifact@v2
       with:
@@ -48,8 +49,9 @@ jobs:
     - uses: FranzDiebold/[email protected]
     - name: Set Humhub version
       run: |
-        export HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
-        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> $GITHUB_ENV
+        HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
+        export HUMHUB_VERSION
+        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> "$GITHUB_ENV"
     - name: Download image archive
       uses: actions/download-artifact@v2
       with:
@@ -59,11 +61,11 @@ jobs:
         docker load --input build-${{ matrix.version }}.tar.gz
         docker build \
           --build-arg HUMHUB_VERSION="${HUMHUB_VERSION}" \
-          --build-arg VCS_REF=`git rev-parse --short HEAD` \
-          --target humhub_${{ matrix.target }} \
-          -t ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }} \
+          --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
+          --target "humhub_${{ matrix.target }}" \
+          -t "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }}" \
           .
-        docker save ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }} | gzip > build-${{ matrix.version }}-${{ matrix.target }}.tar.gz
+        docker save "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }}" | gzip > "build-${{ matrix.version }}-${{ matrix.target }}.tar.gz"
     - name: Upload image archive
       uses: actions/upload-artifact@v2
       with:
@@ -81,8 +83,9 @@ jobs:
     - uses: FranzDiebold/[email protected]
     - name: Set Humhub version
       run: |
-        export HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
-        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> $GITHUB_ENV
+        HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
+        export HUMHUB_VERSION
+        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> "$GITHUB_ENV"
     - name: Download image archive
       uses: actions/download-artifact@v2
       with:
@@ -114,8 +117,9 @@ jobs:
     - uses: FranzDiebold/[email protected]
     - name: Set Humhub version
       run: |
-        export HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
-        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> $GITHUB_ENV
+        HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
+        export HUMHUB_VERSION
+        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> "$GITHUB_ENV"
     - name: Download image archive (phponly)
       uses: actions/download-artifact@v2
       with:
@@ -145,7 +149,7 @@ jobs:
   push_ghcr:
     needs: ["test_aio", "test_prod"]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: ${{ github.ref == 'refs/heads/master' }}
     strategy:
       fail-fast: false
       matrix:
@@ -155,18 +159,19 @@ jobs:
     - uses: actions/checkout@v2
     - uses: FranzDiebold/[email protected]
     - name: Login to registry
-      run: echo "${{ secrets.PAT }}" | docker login ghcr.io --username ${GITHUB_REPOSITORY_OWNER} --password-stdin
+      run: echo "${{ secrets.PAT }}" | docker login ghcr.io --username "${GITHUB_REPOSITORY_OWNER}" --password-stdin
     - name: Set Humhub version
       run: |
-        export HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
-        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> $GITHUB_ENV
+        HUMHUB_VERSION=$(awk -e '$0 ~ /^([0-9\.]+) ${{ matrix.version }}/ {print $1}' versions.txt)
+        export HUMHUB_VERSION
+        echo "HUMHUB_VERSION=$HUMHUB_VERSION" >> "$GITHUB_ENV"
     - name: Download image archive
       uses: actions/download-artifact@v2
       with:
         name: build-${{ matrix.version }}-${{ matrix.target }}
     - name: Load, retag and Push images 
       run: |
         docker load --input build-${{ matrix.version }}-${{ matrix.target }}.tar.gz
-        docker tag ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }} ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub-${{ matrix.target }}:${HUMHUB_VERSION}
-        docker push ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub-${{ matrix.target }}:${HUMHUB_VERSION}
+        docker tag "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub:${GITHUB_REF_NAME_SLUG}-${HUMHUB_VERSION}-${{ matrix.target }}" "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub-${{ matrix.target }}:${HUMHUB_VERSION}"
+        docker push "ghcr.io/${GITHUB_REPOSITORY_OWNER}/humhub-${{ matrix.target }}:${HUMHUB_VERSION}"
         
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -19,9 +19,7 @@ jobs:
       id: update
       run: |
         . ./update.sh
-        echo "CUR_VERSION=$CUR_VERSION" >> $GITHUB_ENV
-        echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
-        echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
+        { echo "CUR_VERSION=$CUR_VERSION"; echo "NEW_VERSION=$NEW_VERSION"; echo "GIT_BRANCH=$GIT_BRANCH"; } >> "$GITHUB_ENV"
     - name: Check git status and log
       run: |
         git status

diff --git a/.markdown-lint.yml b/.markdown-lint.yml
@@ -1 +1 @@
-{ "default": true, "MD013": null }
+{ "default": true, "MD013": null, "MD028": null }
diff --git a/Dockerfile b/Dockerfile
@@ -7,23 +7,10 @@ FROM docker.io/library/alpine:3.14.0 as builder
 
 ARG HUMHUB_VERSION
 
-RUN apk update
-RUN apk add --no-cache \
+RUN apk update && \
+    apk add --no-cache \
     ca-certificates \
-    tzdata
-
-WORKDIR /usr/src/
-ADD https://github.com/humhub/humhub/archive/v${HUMHUB_VERSION}.tar.gz /usr/src/
-RUN tar xzf v${HUMHUB_VERSION}.tar.gz && \
-    mv humhub-${HUMHUB_VERSION} humhub && \
-    rm v${HUMHUB_VERSION}.tar.gz
-
-WORKDIR /usr/src/humhub
-
-COPY --from=builder-composer /usr/bin/composer /usr/bin/composer
-RUN chmod +x /usr/bin/composer
-
-RUN apk add --no-cache \
+    tzdata \
     php7 \
     php7-gd \
     php7-ldap \
@@ -43,24 +30,30 @@ RUN apk add --no-cache \
     php7-tokenizer \
     php7-exif \
     php7-fileinfo \
-    php7-intl
-
-RUN composer install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader && \
-    chmod +x protected/yii && \
-    chmod +x protected/yii.bat
-
-RUN apk add --no-cache \
+    php7-intl \
     nodejs \
-    npm
+    npm \
+    php7-pdo_mysql && \
+    rm -rf /var/cache/apk/*
 
-RUN npm install grunt
-RUN npm install -g grunt-cli
+COPY --from=builder-composer /usr/bin/composer /usr/bin/composer
+RUN chmod +x /usr/bin/composer
 
-RUN apk add --no-cache \
-    php7-pdo_mysql
-RUN grunt build-assets
+WORKDIR /usr/src/
+ADD https://github.com/humhub/humhub/archive/v${HUMHUB_VERSION}.tar.gz /usr/src/
+RUN tar xzf v${HUMHUB_VERSION}.tar.gz && \
+    mv humhub-${HUMHUB_VERSION} humhub && \
+    rm v${HUMHUB_VERSION}.tar.gz
+
+WORKDIR /usr/src/humhub
 
-RUN rm -rf ./node_modules
+RUN composer install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader && \
+    chmod +x protected/yii && \
+    chmod +x protected/yii.bat && \
+    npm install grunt && \
+    npm install -g grunt-cli && \
+    grunt build-assets && \
+    rm -rf ./node_modules
 
 FROM docker.io/library/alpine:3.14.0 as base
 
@@ -76,7 +69,9 @@ LABEL name="HumHub" version=${HUMHUB_VERSION} variant="base" \
       org.label-schema.version=${HUMHUB_VERSION} \
       org.label-schema.schema-version="1.0"
 
-RUN apk add --no-cache \
+RUN BUILD_DEPS="gettext"  \
+    RUNTIME_DEPS="\
+    libintl \
     curl \
     ca-certificates \
     imagemagick \
@@ -108,15 +103,12 @@ RUN apk add --no-cache \
     php7-session \
     supervisor \
     sqlite \
-    && rm -rf /var/cache/apk/*
-
-RUN BUILD_DEPS="gettext"  \
-    RUNTIME_DEPS="libintl" && \
-    set -x && \
-    apk add --no-cache --update $RUNTIME_DEPS && \
-    apk add --no-cache --virtual build_deps $BUILD_DEPS && \
+    " && \
+    apk add --no-cache --update "$RUNTIME_DEPS" && \
+    apk add --no-cache --virtual build_deps "$BUILD_DEPS" && \
     cp /usr/bin/envsubst /usr/local/bin/envsubst && \
-    apk del build_deps
+    apk del build_deps && \
+    rm -rf /var/cache/apk/*
 
 ENV PHP_POST_MAX_SIZE=16M
 ENV PHP_UPLOAD_MAX_FILESIZE=10M
@@ -179,9 +171,8 @@ FROM base as humhub_allinone
 
 LABEL variant="allinone"
 
-RUN apk add --no-cache nginx
-
-RUN chown -R nginx:nginx /var/lib/nginx/
+RUN apk add --no-cache nginx && \
+    chown -R nginx:nginx /var/lib/nginx/
 
 COPY nginx/ /
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "default": true, "MD013": null }
		{ "default": true, "MD013": null, "MD028": null }