v3.5.4

escapace · Mar 2, 2020 · 7ce5765 · 7ce5765
1 parent c692f6e
commit 7ce5765
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -59,33 +59,17 @@ jobs:
         auth_header="$(git config --local --get http.https://github.com/.extraheader)"
         git submodule sync --recursive
         git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-    - name: Docker Login
+    - name: Docker Build & Push
       if: contains(github.ref, 'tags/v')
-      uses: actions/docker/login@fe7ed3ce992160973df86480b83a2f8ed581cd50
-      env:
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-    - name: Docker Build
-      if: contains(github.ref, 'tags/v')
-      uses: actions/docker/cli@fe7ed3ce992160973df86480b83a2f8ed581cd50
-      with:
-        args: build -t escapace/manage:latest -t escapace/manage:${GITHUB_REF:11} .
-    - name: Docker Push Latest
-      if: contains(github.ref, 'tags/v')
-      uses: actions/docker/cli@fe7ed3ce992160973df86480b83a2f8ed581cd50
-      env:
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      with:
-        args: push escapace/manage:latest
-    - name: Docker Push Tag
-      if: contains(github.ref, 'tags/v')
-      uses: actions/docker/cli@fe7ed3ce992160973df86480b83a2f8ed581cd50
+      shell: bash
+      run: |
+        echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
+        docker build -t escapace/manage:latest -t escapace/manage:${GITHUB_REF:11} .
+        docker push escapace/manage:latest
+        docker push escapace/manage:${GITHUB_REF:11}
       env:
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      with:
-        args: push escapace/manage:${GITHUB_REF:11}
   release:
     name: "Github Release"
     runs-on: ubuntu-latest

diff --git a/manage b/manage
@@ -33,7 +33,7 @@ else
     exit 1
 fi
 
-MANAGE_VERSION="v3.5.3"
+MANAGE_VERSION="v3.5.4"
 
 MANAGE_IS_CI () {
     # Returns 0 if the current environment