mirror of
https://gitlab.com/openlp/runners.git
synced 2024-12-22 11:22:48 +00:00
Merge branch 'push-to-docker-hub' into 'master'
Push to Docker Hub instead of GitLab registry See merge request openlp/runners!3
This commit is contained in:
Tim Bentley
commit
c427bf0712
@ -4,39 +4,38 @@ services:
|
|||||||
- docker:dind
|
- docker:dind
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
|
- echo "$DOCKER_TOKEN" | docker login --username "$DOCKER_USER" --password-stdin
|
||||||
|
|
||||||
build-debian:
|
build-debian:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker pull $CONTAINER_IMAGE:debian || true
|
- docker pull openlp/debian || true
|
||||||
- docker build --cache-from $CONTAINER_IMAGE:debian --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:debian -f Dockerfile.debian .
|
- docker build --cache-from openlp/debian --tag openlp/debian:$CI_COMMIT_SHA --tag openlp/debian:latest -f Dockerfile.debian .
|
||||||
- docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
|
- docker push openlp/debian:$CI_COMMIT_SHA
|
||||||
- docker push $CONTAINER_IMAGE:debian
|
- docker push openlp/debian:latest
|
||||||
only:
|
only:
|
||||||
- master@openlp/runners
|
- master@openlp/runners
|
||||||
|
|
||||||
build-ubuntu:
|
build-ubuntu:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker pull $CONTAINER_IMAGE:ubuntu || true
|
- docker pull openlp/ubuntu || true
|
||||||
- docker build --cache-from $CONTAINER_IMAGE:ubuntu --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:ubuntu -f Dockerfile.ubuntu .
|
- docker build --cache-from openlp/ubuntu --tag openlp/ubuntu:$CI_COMMIT_SHA --tag openlp/ubuntu:latest -f Dockerfile.ubuntu .
|
||||||
- docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
|
- docker push openlp/ubuntu:$CI_COMMIT_SHA
|
||||||
- docker push $CONTAINER_IMAGE:ubuntu
|
- docker push openlp/ubuntu:latest
|
||||||
only:
|
only:
|
||||||
- master@openlp/runners
|
- master@openlp/runners
|
||||||
|
|
||||||
build-fedora:
|
build-fedora:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker pull $CONTAINER_IMAGE:fedora || true
|
- docker pull openlp/fedora || true
|
||||||
- docker build --cache-from $CONTAINER_IMAGE:fedora --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:fedora -f Dockerfile.fedora .
|
- docker build --cache-from openlp/fedora --tag openlp/fedora:$CI_COMMIT_SHA --tag openlp/fedora:latest -f Dockerfile.fedora .
|
||||||
- docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
|
- docker push openlp/fedora:$CI_COMMIT_SHA
|
||||||
- docker push $CONTAINER_IMAGE:fedora
|
- docker push openlp/fedora:latest
|
||||||
only:
|
only:
|
||||||
- master@openlp/runners
|
- master@openlp/runners
|
||||||
|
|||||||
@ -2,9 +2,9 @@ FROM debian:unstable
|
|||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
|
apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
|
||||||
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
|
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebengine \
|
||||||
python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
|
python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic python3-chardet python3-lxml \
|
||||||
python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
|
python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
|
||||||
python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
|
python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
|
||||||
python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
|
python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
|
||||||
python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
|
python3-flake8 flake8 mediainfo mupdf-tools xvfb
|
||||||
|
|||||||
@ -2,8 +2,8 @@ FROM fedora
|
|||||||
|
|
||||||
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
|
||||||
RUN dnf install -y python3-PyQt5 python3-qt5-webkit python3-qt5-webengine python3-sqlalchemy python3-alembic \
|
RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python3-alembic python3-beautifulsoup4 \
|
||||||
python3-beautifulsoup4 python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest \
|
python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest python3-websockets \
|
||||||
python3-websockets python3-appdirs python3-webob python3-QtAwesome python3-waitress \
|
python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \
|
||||||
python3-pymediainfo python3-pyopengl python3-pylint python-pysword python3-requests \
|
python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 mediainfo patch \
|
||||||
mediainfo patch xorg-x11-server-Xvfb python3-vlc python3-zeroconf
|
xorg-x11-server-Xvfb ghostscript mupdf
|
||||||
|
|||||||
@ -2,9 +2,9 @@ FROM ubuntu:rolling
|
|||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
|
apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
|
||||||
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
|
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebengine \
|
||||||
python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
|
python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic python3-chardet python3-lxml \
|
||||||
python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
|
python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
|
||||||
python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
|
python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
|
||||||
python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
|
python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
|
||||||
python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
|
python3-flake8 flake8 mediainfo mupdf-tools xvfb
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user