Merge pull request #52 from doxa-tech/fix/deploy-build-args

Fixes build args set during build
doxa-tech · Dec 9, 2021 · f8336e6 · f8336e6
2 parents 21a9eef + 0dd32b3
commit f8336e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -32,6 +32,13 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Get build args
+        id: bargs
+        run: |
+          echo "::set-output name=shortsha::$(git rev-parse --short ${GITHUB_SHA})"
+          echo "::set-output name=buildurl::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}"
+          echo "::set-output name=date::$(date +'%d/%m/%y %H:%M')"
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
@@ -42,9 +49,9 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             site_version=${{ steps.meta.outputs.version }}
-            site_build_hash=$(git rev-parse --short "$GITHUB_SHA")
-            site_build_url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}"
-            site_build_time="$(date +'%d/%m/%y %H:%M')"
+            site_build_hash=${{ steps.bargs.outputs.shortsha }}
+            site_build_url=${{ steps.bargs.outputs.buildurl }}
+            site_build_time=${{ steps.bargs.outputs.date }}
 
       - name: Redeploy container on Jelastic
         run: |

diff --git a/app/assets/stylesheets/layouts/footer.scss b/app/assets/stylesheets/layouts/footer.scss
@@ -89,7 +89,7 @@ div#application-footer {
 div#application-footer-second {
   text-align: center;
   font-size: 0.8em;
-  padding: 20px 20px 5px 20px;
+  padding: 20px 20px 10px 20px;
 
   a {
     text-decoration: underline;
@@ -105,9 +105,14 @@ div#application-footer-second {
       padding: 0 0 5px 0;
       list-style: none;
 
-      &::marker {
+      &::marker,
+      &::-webkit-details-marker {
         display: none;
       }
+
+      &:focus {
+        outline: 0;
+      }
     }
 
     p {