diff options
author | 2023-09-26 16:29:02 -0700 | |
---|---|---|
committer | 2023-09-26 16:32:43 -0700 | |
commit | d77dd4a75afb8b45be1dbb4270ac962d4d76001a (patch) | |
tree | 3cfb73084da92b4219375f3bf380e6b5690f290b | |
parent | 8031786f5662ac9f75b99989834ecd163df924d4 (diff) | |
download | bun-d77dd4a75afb8b45be1dbb4270ac962d4d76001a.tar.gz bun-d77dd4a75afb8b45be1dbb4270ac962d4d76001a.tar.zst bun-d77dd4a75afb8b45be1dbb4270ac962d4d76001a.zip |
Update docker workflow
-rw-r--r-- | .github/workflows/bun-release-canary.yml | 58 | ||||
-rw-r--r-- | .github/workflows/bun-release.yml | 16 |
2 files changed, 25 insertions, 49 deletions
diff --git a/.github/workflows/bun-release-canary.yml b/.github/workflows/bun-release-canary.yml index fe0078902..a814ece4e 100644 --- a/.github/workflows/bun-release-canary.yml +++ b/.github/workflows/bun-release-canary.yml @@ -63,54 +63,18 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - # npm-types: - # name: Release types to NPM - # runs-on: ubuntu-latest - # defaults: - # run: - # working-directory: packages/bun-types - # steps: - # - id: checkout - # name: Checkout - # uses: actions/checkout@v3 - # - id: setup-node - # name: Setup Node.js - # uses: actions/setup-node@v3 - # with: - # node-version: latest - # - id: setup-bun - # name: Setup Bun - # uses: oven-sh/setup-bun@v1 - # with: - # bun-version: canary - # - id: bun-install - # name: Install Dependencies - # run: bun install - # - id: setup-env - # name: Setup Environment - # run: | - # SHA=$(git rev-parse --short "$GITHUB_SHA") - # VERSION=$(bun --version) - # TAG="${VERSION}-canary.$(date '+%Y%m%d').1+${SHA}" - # echo "Setup tag: ${TAG}" - # echo "TAG=${TAG}" >> ${GITHUB_ENV} - # - id: bun-run - # name: Build - # run: bun run build - # env: - # BUN_VERSION: ${{ env.TAG }} - # - id: npm-publish - # name: Release - # uses: JS-DevTools/npm-publish@v1 - # with: - # package: packages/bun-types/dist/package.json - # token: ${{ secrets.NPM_TOKEN }} - # tag: canary docker: - name: Release to Dockerhub + name: Release to Dockerhub (${{ matrix.variant }}) runs-on: ubuntu-latest needs: sign if: github.repository_owner == 'oven-sh' + strategy: + matrix: + variant: + - debian + - slim + - alpine + - distroless steps: - id: checkout name: Checkout @@ -128,6 +92,9 @@ jobs: uses: docker/metadata-action@v4 with: images: oven/bun + flavor: | + latest=${{ matrix.variant == 'debian' }} + suffix=${{ matrix.variant }} tags: canary - id: login name: Login to Docker @@ -139,8 +106,7 @@ jobs: name: Push to Docker uses: docker/build-push-action@v3 with: - context: ./dockerhub - file: ./dockerhub/Dockerfile-debian + context: ./dockerhub/${{ matrix.variant }} platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true diff --git a/.github/workflows/bun-release.yml b/.github/workflows/bun-release.yml index 65cef1e0d..ab08246e0 100644 --- a/.github/workflows/bun-release.yml +++ b/.github/workflows/bun-release.yml @@ -129,10 +129,17 @@ jobs: package: packages/bun-types/dist/package.json token: ${{ secrets.NPM_TOKEN }} docker: - name: Release to Dockerhub + name: Release to Dockerhub (${{ matrix.variant }}) runs-on: ubuntu-latest needs: sign if: github.repository_owner == 'oven-sh' + strategy: + matrix: + variant: + - debian + - slim + - alpine + - distroless steps: - id: checkout name: Checkout @@ -157,9 +164,13 @@ jobs: uses: docker/metadata-action@v4 with: images: oven/bun + flavor: | + latest=${{ matrix.variant == 'debian' }} + suffix=${{ matrix.variant }} tags: | type=match,pattern=(bun-v)?(\d+.\d+.\d+),group=2,value=${{ env.TAG }} type=match,pattern=(bun-v)?(\d+.\d+),group=2,value=${{ env.TAG }} + type=match,pattern=(bun-v)?(\d+),group=2,value=${{ env.TAG }} - id: login name: Login to Docker uses: docker/login-action@v2 @@ -170,8 +181,7 @@ jobs: name: Push to Docker uses: docker/build-push-action@v3 with: - context: ./dockerhub - file: ./dockerhub/Dockerfile-debian + context: ./dockerhub/${{ matrix.variant }} platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true |