Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

re-enable multiarch image building in actions #141

Closed
wants to merge 3 commits into from
Closed

re-enable multiarch image building in actions #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1514b85
re-enable multiarch
tobybellwood Jul 31, 2023
39c3fce
newer yarn
tobybellwood Aug 3, 2023
771c866
updae gh action versions
tobybellwood Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .github/workflows/docker-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
steps:
-
name: Checkout PR
uses: actions/checkout@v2
uses: actions/checkout@v3
if: ${{ github.event_name == 'pull_request' }}
with:
fetch-depth: "0"
ref: ${{ github.event.pull_request.head.sha }}
-
name: Checkout Branch or Tag
uses: actions/checkout@v2
uses: actions/checkout@v3
if: ${{ github.event_name != 'pull_request' }}
with:
fetch-depth: "0"
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
-
name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -73,32 +73,45 @@ jobs:
type=ref,event=branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GHCR
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
name: Build and push amd64
uses: docker/build-push-action@v4
with:
context: .
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64
build-args: |
"LAGOON_VERSION=${{ env.VERSION }}"
"LAGOON_VERSION=${{ env.LAGOON_VERSION }}"
"UI_VERSION=${{ env.UI_VERSION }}"
"BUILD=${{ env.BUILD }}"
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-
name: Build and push arm64
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/arm64
build-args: |
"LAGOON_VERSION=${{ env.LAGOON_VERSION }}"
"UI_VERSION=${{ env.UI_VERSION }}"
"BUILD=${{ env.BUILD }}"
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
30 changes: 21 additions & 9 deletions .github/workflows/lagoon-core-docker-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
-
name: Checkout Branch or Tag
uses: actions/checkout@v2
uses: actions/checkout@v3
if: ${{ github.event_name != 'pull_request' }}
with:
fetch-depth: "0"
Expand All @@ -30,7 +30,7 @@ jobs:
-
name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -41,29 +41,28 @@ jobs:
type=ref,event=tag
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GHCR
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
name: Build and push amd64
uses: docker/build-push-action@v4
with:
context: .
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64
build-args: |
"LAGOON_VERSION=${{ env.LAGOON_VERSION }}"
Expand All @@ -72,3 +71,16 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-
name: Build and push arm64
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/arm64
build-args: |
"LAGOON_VERSION=${{ env.LAGOON_VERSION }}"
"UI_VERSION=${{ env.UI_VERSION }}"
"BUILD=${{ env.BUILD }}"
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
11 changes: 10 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,13 @@ build-storybook.log
docker-compose.override.yml

# ts linter
*.tsbuildinfo
*.tsbuildinfo

# yarn berry
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.1.cjs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.1.cjs
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,6 @@
},
"msw": {
"workerDirectory": "public"
}
},
"packageManager": "[email protected]"
}
Loading