openlp/runners
1
0
Fork 0
mirror of https://gitlab.com/openlp/runners.git synced 2024-12-22 11:22:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'update-fedora-39' into 'master'

Browse Source 
Update Fedora to 39

See merge request openlp/runners!36
This commit is contained in:
Tim Bentley 2024-02-14 17:22:21 +00:00
commit 491d14775d
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.gitlab-ci.yml
View File

@ -88,13 +88,11 @@ build-debian:
- docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian . - docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
- docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA - docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/debian:latest - docker push $IMAGE_BASE/debian:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.debian - Dockerfile.debian
build-ubuntu: build-ubuntu:
stage: build stage: build
script: script:
@ -102,9 +100,8 @@ build-ubuntu:
- docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu . - docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
- docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA - docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/ubuntu:latest - docker push $IMAGE_BASE/ubuntu:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.ubuntu - Dockerfile.ubuntu
@ -115,9 +112,8 @@ build-fedora:
- docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora . - docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
- docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA - docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/fedora:latest - docker push $IMAGE_BASE/fedora:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.fedora - Dockerfile.fedora
@ -128,9 +124,8 @@ build-arch:
- docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch . - docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
- docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA - docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/arch:latest - docker push $IMAGE_BASE/arch:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.arch - Dockerfile.arch
@ -141,9 +136,8 @@ build-angular:
- docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular . - docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
- docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA - docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/angular:latest - docker push $IMAGE_BASE/angular:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.angular - Dockerfile.angular
@ -154,9 +148,8 @@ build-documentation:
- docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation . - docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
- docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA - docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/documentation:latest - docker push $IMAGE_BASE/documentation:latest
only: rules:
refs: - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
- master@openlp/runners
changes: changes:
- Dockerfile.documentation - Dockerfile.documentation

2
Dockerfile.fedora
View File

@ -1,4 +1,4 @@
FROM fedora:38 FROM fedora:39
RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm