Skip to content

Commit

Permalink
Merge pull request #290 from pabloromeo/dev
Browse files Browse the repository at this point in the history
Dependency updates and EAE version bump
  • Loading branch information
pabloromeo authored Apr 19, 2024
2 parents 8d579e5 + fe1de46 commit d013626
Show file tree
Hide file tree
Showing 8 changed files with 623 additions and 266 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "src"
fetch-depth: 0

- name: Checkout gh-pages branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "dest"
ref: "gh-pages"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/lscr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
steps:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
Expand All @@ -41,20 +41,20 @@ jobs:

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
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@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta for PMS-dockermod
id: meta_pms_dockermod
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -70,7 +70,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push PMS-dockermod
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./pms
file: ./pms/docker-mod/Dockerfile
Expand All @@ -93,7 +93,7 @@ jobs:
steps:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
Expand All @@ -102,21 +102,21 @@ jobs:

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
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@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta for worker-dockermod
id: meta_worker_dockermod
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
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 worker-dockermod
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./worker
file: ./worker/docker-mod/Dockerfile
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
steps:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
Expand All @@ -49,20 +49,20 @@ jobs:

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
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@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta for PMS
id: meta_pms
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -78,7 +78,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push PMS
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./pms
file: ./pms/extended-image/Dockerfile
Expand All @@ -101,11 +101,11 @@ jobs:
steps:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
Expand All @@ -116,21 +116,21 @@ jobs:

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
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@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta for Worker
id: meta_worker
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -146,7 +146,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push Worker
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./worker
file: ./worker/extended-image/Dockerfile
Expand All @@ -169,11 +169,11 @@ jobs:
steps:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
Expand All @@ -184,21 +184,21 @@ jobs:

- name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
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@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta for Orchestrator
id: meta_orchestrator
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -214,7 +214,7 @@ jobs:
type=semver,pattern={{major}}
type=sha
- name: Build and push Orchestrator
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./orchestrator
platforms: linux/amd64,linux/arm64
Expand Down
Loading

0 comments on commit d013626

Please sign in to comment.