Commit 9222b265 authored by Recteur LP's avatar Recteur LP

Fix registry push

parent 94122522
Pipeline #1495 failed
......@@ -23,6 +23,8 @@ Docker Tests:
- buildah
script:
- make tests
after_script:
- buildah rmi -p
only:
- master
- tags
......@@ -33,7 +35,10 @@ Fedora Build & Release:
- buildah
script:
- make build CI_COMMIT_TAG=${CI_COMMIT_TAG:-latest}
- buildah login --authfile ~/.auth.json docker.io
- buildah push docker.io/pyrmin/pyrmin:${CI_COMMIT_TAG:-latest}
after_script:
- buildah rmi -p
only:
- master
- tags
......@@ -44,7 +49,10 @@ CentOS 7 Docker Build & Release:
- buildah
script:
- make build27 CI_COMMIT_TAG=${CI_COMMIT_TAG:-latest}
- buildah login --authfile ~/.auth.json docker.io
- buildah push docker.io/pyrmin/pyrmin:27-${CI_COMMIT_TAG:-latest}
after_script:
- buildah rmi -p
only:
- master
- tags
......@@ -55,7 +63,10 @@ CentOS 8 Docker Build & Release:
- buildah
script:
- make build-el8 CI_COMMIT_TAG=${CI_COMMIT_TAG:-latest}
- buildah push docker.io/pyrmin/pyrmin-el8:${CI_COMMIT_TAG:-latest}
- buildah login --authfile ~/.auth.json docker.io
- buildah push docker.io/pyrmin/pyrmin:el8-${CI_COMMIT_TAG:-latest}
after_script:
- buildah rmi -p
only:
- master
- tags
......@@ -28,15 +28,15 @@ vendor:
@grunt copy
build: vendor auto-proxy
@buildah bud -f container/pyrmin.container -t docker.io/pyrmin/pyrmin
@buildah bud -f container/pyrmin.container -v $(shell pwd):/opt/tmp -t docker.io/pyrmin/pyrmin
@buildah tag docker.io/pyrmin/pyrmin docker.io/pyrmin/pyrmin:$(CI_COMMIT_TAG)
build27: vendor auto-proxy
@buildah bud -f container/python2/pyrmin.container -t docker.io/pyrmin/pyrmin:27-latest
@buildah bud -f container/python2/pyrmin.container -v $(shell pwd):/opt/tmp -t docker.io/pyrmin/pyrmin:27-latest
@buildah tag docker.io/pyrmin/pyrmin:27-latest docker.io/pyrmin/pyrmin:27-$(CI_COMMIT_TAG)
build-el8: vendor auto-proxy
@buildah bud -f container/el8/pyrmin.container -t docker.io/pyrmin/pyrmin:el8-latest
@buildah bud -f container/el8/pyrmin.container -v $(shell pwd):/opt/tmp -t docker.io/pyrmin/pyrmin:el8-latest
@buildah tag docker.io/pyrmin/pyrmin:el8-latest docker.io/pyrmin/pyrmin:el8-$(CI_COMMIT_TAG)
start:
......
FROM centos:8
MAINTAINER pyrmin.io <support@pyrmin.io>
ADD . /opt/tmp
RUN dnf install -y 'dnf-command(config-manager)' epel-release \
&& dnf config-manager --set-enabled PowerTools \
&& dnf -y install \
......@@ -34,7 +32,7 @@ RUN dnf install -y 'dnf-command(config-manager)' epel-release \
&& chmod +rx /entrypoint.sh \
&& chown -R pyrmin /etc/pyrmin /usr/share/pyrmin/plugins /var/log/pyrmin /opt/pyrmin /static \
&& dnf clean all \
&& rm -rf /usr/share/doc /usr/share/man /tmp/* /opt/tmp
&& rm -rf /usr/share/doc /usr/share/man /tmp/*
USER pyrmin
WORKDIR /var/log/pyrmin
......
......@@ -3,8 +3,6 @@ MAINTAINER pyrmin.io <support@pyrmin.io>
ENV TERM xterm
ADD . /opt/tmp
RUN dnf -v -y install \
dnf \
dnf-plugins-core \
......@@ -34,7 +32,7 @@ RUN dnf -v -y install \
&& chmod +rx /entrypoint.sh \
&& chown -R pyrmin /etc/pyrmin /usr/share/pyrmin/plugins /var/log/pyrmin /opt/pyrmin /static \
&& dnf clean all \
&& rm -rf /usr/share/doc /usr/share/man /tmp/* /opt/tmp
&& rm -rf /usr/share/doc /usr/share/man /tmp/*
USER pyrmin
WORKDIR /var/log/pyrmin
......
FROM centos:7
MAINTAINER pyrmin.io <support@pyrmin.io>
# Python 2 Container
ENV TERM xterm
ADD . /opt/tmp
RUN yum -v -y install \
epel-release \
......@@ -39,7 +34,7 @@ RUN yum -v -y install \
&& chmod +rx /entrypoint.sh \
&& chown -R pyrmin /etc/pyrmin /usr/share/pyrmin/plugins /var/log/pyrmin /opt/pyrmin /static \
&& yum clean all \
&& rm -rf /usr/share/doc /usr/share/man /tmp/* /opt/tmp
&& rm -rf /usr/share/doc /usr/share/man /tmp/*
USER pyrmin
WORKDIR /var/log/pyrmin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment