diff options
| author | Max Isom <[email protected]> | 2022-03-26 17:51:34 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-26 16:51:34 -0500 |
| commit | 986b055e1195dba200f4b295ad3c32ae53f3ec75 (patch) | |
| tree | 53a7e0733fc7f4fa84b760bc4c1e6b912bf86fda | |
| parent | 297228692c7f692f059d7988d76c56578626e9fb (diff) | |
| download | muse-986b055e1195dba200f4b295ad3c32ae53f3ec75.tar.xz muse-986b055e1195dba200f4b295ad3c32ae53f3ec75.zip | |
Add args during build (#607)
| -rw-r--r-- | .github/workflows/pr.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/publish.yml | 9 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | src/utils/log-banner.ts | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c96dfb2..a1066c9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,6 +23,8 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Cache Docker layers + # AWS data transfer is pricy + if: ${{ matrix.runner-platform != 'self-hosted' }} uses: actions/cache@v2 with: path: /tmp/.buildx-cache @@ -40,6 +42,10 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} + - name: Get current time + uses: josStorer/get-current-time@v2 + id: current-time + - name: Build and push id: docker_build uses: docker/build-push-action@v2 @@ -50,6 +56,9 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache,mode=min platforms: ${{ matrix.build-arch }} + build-args: | + COMMIT_HASH=${{ github.sha }} + BUILD_DATE=${{ steps.current-time.outputs.time }} combine-and-comment: name: Combine platform tags and leave comment diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d3fed5e..58df795 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,6 +25,8 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Cache Docker layers + # AWS data transfer is pricy + if: ${{ matrix.runner-platform != 'self-hosted' }} uses: actions/cache@v2 with: path: /tmp/.buildx-cache @@ -38,6 +40,10 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Get current time + uses: josStorer/get-current-time@v2 + id: current-time + - name: Build and push id: docker_build uses: docker/build-push-action@v2 @@ -47,6 +53,9 @@ jobs: platforms: ${{ matrix.build-arch }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache,mode=min + build-args: | + COMMIT_HASH=${{ github.sha }} + BUILD_DATE=${{ steps.current-time.outputs.time }} combine: name: Combine platform tags @@ -27,10 +27,11 @@ COPY . . RUN yarn prisma generate ARG COMMIT_HASH=unknown +ARG BUILD_DATE=unknown ENV DATA_DIR /data ENV NODE_ENV production -ENV BUILD_DATE $(date) ENV COMMIT_HASH $COMMIT_HASH +ENV BUILD_DATE $BUILD_DATE CMD ["yarn", "start"] diff --git a/src/utils/log-banner.ts b/src/utils/log-banner.ts index 5033a61..14f5943 100644 --- a/src/utils/log-banner.ts +++ b/src/utils/log-banner.ts @@ -10,6 +10,7 @@ const logBanner = () => { githubSponsor: 'codetheweb', madeByPrefix: 'Made with 🎶 by ', buildDate: process.env.BUILD_DATE ? new Date(process.env.BUILD_DATE) : undefined, + commit: process.env.COMMIT_HASH ?? 'unknown', }).join('\n')); console.log('\n'); }; |