Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 02:35:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3832 from wy65701436/master

Browse Source 
Remove the workaroud for avoiding photon distro-sync error
This commit is contained in:
Daniel Jiang 2017-12-20 15:06:43 +08:00 committed by GitHub
commit 068d6a35df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/photon/clair/Dockerfile
View File

@ -1,7 +1,7 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf erase vim -y \ && tdnf erase vim -y \
&& tdnf install -y git shadow sudo bzr rpm xz python-xml \ && tdnf install -y git shadow sudo bzr rpm xz python-xml \
&& tdnf clean all \ && tdnf clean all \

2
make/photon/log/Dockerfile
View File

@ -1,6 +1,6 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo net-tools\ && tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo net-tools\
&& mkdir /etc/rsyslog.d/ \ && mkdir /etc/rsyslog.d/ \
&& mkdir /var/spool/rsyslog \ && mkdir /var/spool/rsyslog \

2
make/photon/mariadb/Dockerfile
View File

@ -2,7 +2,7 @@ FROM vmware/photon:1.0
#The Docker Daemon has to be running with storage backend btrfs when building the image #The Docker Daemon has to be running with storage backend btrfs when building the image
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools \ && tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools \
&& groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \ && groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \
&& tdnf install -y mariadb-server mariadb \ && tdnf install -y mariadb-server mariadb \

2
make/photon/nginx/Dockerfile
View File

@ -1,6 +1,6 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf install -y nginx \ && tdnf install -y nginx \
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \

2
make/photon/notary/server.Dockerfile
View File

@ -1,6 +1,6 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf erase vim -y \ && tdnf erase vim -y \
&& tdnf install -y shadow sudo \ && tdnf install -y shadow sudo \
&& tdnf clean all \ && tdnf clean all \

2
make/photon/notary/signer.Dockerfile
View File

@ -1,6 +1,6 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf erase vim -y \ && tdnf erase vim -y \
&& tdnf install -y shadow sudo \ && tdnf install -y shadow sudo \
&& tdnf clean all \ && tdnf clean all \

2
make/photon/postgresql/Dockerfile
View File

@ -3,7 +3,7 @@ FROM vmware/photon:1.0
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
RUN touch /etc/localtime.bak \ RUN touch /etc/localtime.bak \
&& tdnf distro-sync -y || echo \ && tdnf distro-sync -y \
&& tdnf install -y sed shadow gzip postgresql\ && tdnf install -y sed shadow gzip postgresql\
&& groupadd -r postgres --gid=999 \ && groupadd -r postgres --gid=999 \
&& useradd -r -g postgres --uid=999 postgres \ && useradd -r -g postgres --uid=999 postgres \

2
make/photon/registry/Dockerfile
View File

@ -3,7 +3,7 @@ FROM vmware/photon:1.0
MAINTAINER wangyan@vmware.com MAINTAINER wangyan@vmware.com
# The original script in the docker offical registry image. # The original script in the docker offical registry image.
RUN tdnf distro-sync -y || echo \ RUN tdnf distro-sync -y \
&& tdnf erase vim -y \ && tdnf erase vim -y \
&& tdnf install sudo -y \ && tdnf install sudo -y \
&& tdnf clean all \ && tdnf clean all \