Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into fix-arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillmartin committed Apr 4, 2024
2 parents a30e860 + 9ac6eda commit 607b719
Show file tree
Hide file tree
Showing 14 changed files with 884 additions and 902 deletions.
109 changes: 0 additions & 109 deletions .circleci/config.yml

This file was deleted.

106 changes: 0 additions & 106 deletions .github/workflows/build.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/build_php_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build PHP V2X-Hub Web UI
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/php
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
file: ./docker/Dockerfile-php
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
48 changes: 48 additions & 0 deletions .github/workflows/build_port_drayage_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Port Drayage Web Service
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/port-drayage-webservice
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
context: ./tools/port-drayage-webservice/
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
47 changes: 47 additions & 0 deletions .github/workflows/build_v2xhub_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build V2X-Hub Docker Image
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/v2xhub
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
Loading

0 comments on commit 607b719

Please sign in to comment.