Skip to content

Commit

Permalink
Merge pull request #246 from entur/github-action
Browse files Browse the repository at this point in the history
Move docker build to github workflow
  • Loading branch information
testower authored Sep 11, 2023
2 parents 50f8809 + 1b849be commit 7b526c1
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 18 deletions.
18 changes: 0 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ aliases:
echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV
echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV
.circleci/trigger_build_v2.sh "entur/lamassu-deployment-config.git" "master" "$(git log -1 --pretty=%B)"
- &docker-build
name: Docker build
command: |
DOCKER_BUILDKIT=1 docker build .
jobs:
test:
Expand Down Expand Up @@ -108,17 +104,6 @@ jobs:
# Cannot use -o because of snapshot dependencies.
- run: mvn deploy -s .circleci/settings.xml -P prettierSkip -DskipTests
- run: *post_build
docker-build:
docker:
- image: cimg/openjdk:17.0.8
auth:
username: $DOCKERHUB_LOGIN
password: $DOCKERHUB_PASSWORD
steps:
- setup_remote_docker:
version: 20.10.24
- checkout
- run: *docker-build

workflows:
version: 2.1
Expand All @@ -136,6 +121,3 @@ workflows:
- master
requires:
- test-release
- docker-build:
name: docker-build
context: global
60 changes: 60 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: CI Build

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
tests:
runs-on: ubuntu-latest
env:
TZ: Europe/Oslo
steps:
- uses: actions/checkout@v3

# nodejs is needed because the dynamic download of it via the prettier maven plugin often
# times out
# Example: https://github.com/opentripplanner/OpenTripPlanner/actions/runs/4490450225/jobs/7897533439
- uses: actions/setup-node@v3
with:
node-version: 18

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin
cache: maven

- name: Run tests
run: |
sudo timedatectl set-timezone "Europe/Oslo"
mvn --batch-mode jacoco:prepare-agent test jacoco:report -Dprettier.nodePath=node -Dprettier.npmPath=npm
image:
# only build and push the image when it's a commit to master in Entur's repository
if: github.repository_owner == 'entur' && github.event_name == 'push'
runs-on: ubuntu-latest
needs: [ tests ]
env:
CONTAINER_REPO: docker.io/entur/lamassu
CONTAINER_REGISTRY_USER: ${{ secrets.DOCKERHUB_LOGIN }}
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
steps:
- uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin
cache: maven

- name: Build container image with Jib, push to Github Container Repo
run: |
image_date=`date +%Y-%m-%dT%H-%M`
mvn --batch-mode compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_date -Dmaven.test.skip -P prettierSkip

0 comments on commit 7b526c1

Please sign in to comment.