Skip to content

Commit

Permalink
Merge pull request #154 from pabloromeo/dev
Browse files Browse the repository at this point in the history
Updating dependencies and adding support for ARM64
  • Loading branch information
pabloromeo authored Jul 6, 2022
2 parents da1cab8 + dcfc148 commit 0c370d6
Show file tree
Hide file tree
Showing 5 changed files with 782 additions and 603 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,31 @@ jobs:

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

# - name: Available platforms
# run: echo ${{ steps.buildx.outputs.platforms }}

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta for PMS
id: meta_pms
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 @@ -72,7 +72,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push PMS
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./pms
file: ./pms/extended-image/Dockerfile
Expand All @@ -99,24 +99,24 @@ jobs:
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta for PMS-dockermod
id: meta_pms_dockermod
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 @@ -132,7 +132,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push PMS-dockermod
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./pms
file: ./pms/docker-mod/Dockerfile
Expand All @@ -159,33 +159,33 @@ jobs:

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

# - name: Available platforms
# run: echo ${{ steps.buildx.outputs.platforms }}

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

-
name: Docker meta for Worker
id: meta_worker
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 @@ -201,7 +201,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push Worker
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./worker
file: ./worker/extended-image/Dockerfile
Expand Down Expand Up @@ -229,26 +229,26 @@ jobs:
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

-
name: Docker meta for worker-dockermod
id: meta_worker_dockermod
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 @@ -264,7 +264,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push worker-dockermod
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./worker
file: ./worker/docker-mod/Dockerfile
Expand All @@ -291,33 +291,33 @@ jobs:

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

# - name: Available platforms
# run: echo ${{ steps.buildx.outputs.platforms }}

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

-
name: Docker meta for Orchestrator
id: meta_orchestrator
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 @@ -333,7 +333,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push Orchestrator
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./orchestrator
platforms: linux/amd64,linux/arm/v7 # linux/arm64
Expand Down
Loading

0 comments on commit 0c370d6

Please sign in to comment.