Skip to content

Commit

Permalink
Move creation of GitLab container to GitHub Actions
Browse files Browse the repository at this point in the history
Although we duplicate code now, the intent is so much easier to follow
  • Loading branch information
vmcj committed Jan 12, 2024
1 parent c51e4f7 commit 69e41f6
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 148 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/build-gitlab-container-PR.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: 'Build GitLab CI container (PR)'

on:
push:
pull_request_target:
branches:
- main

jobs:
pr-gitlab:
if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'main' }}
name: PR GitLab image
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- uses: actions/checkout@v4

- name: Use the same PHP config as the contributor containers
run: cp -r docker-{contributor,gitlabci}/php-config

- name: Log in to GitHub Container registry (possibly at fork)
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ghcr.io/${{ github.repository }}

- name: Build and push Docker images
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
with:
context: "./docker-gitlabci"
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
40 changes: 40 additions & 0 deletions .github/workflows/build-gitlab-container-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: 'Build GitLab CI container (Accepted)'

on:
push:
branches:
- main
jobs:
build-gitlab:
if: ${{ github.repository == domjudge/domjudge-packaging && github.ref == main }}
name: Build GitLab image
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- uses: actions/checkout@v4

- name: Use the same PHP config as the contributor containers
run: cp -r docker-{contributor,gitlabci}/php-config

- name: Log in to Docker Container registry
if: github.ref == 'refs/heads/main'
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: domjudge/gitlabci

- name: Build and push Docker images
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
with:
context: "./docker-gitlabci"
push: true
tags: "domjudge/gitlabci:22.04"
labels: ${{ steps.meta.outputs.labels }}
148 changes: 0 additions & 148 deletions .gitlab-ci.yml

This file was deleted.

0 comments on commit 69e41f6

Please sign in to comment.