root
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Rebuild Harbor images based on photon:2.0 (#6054) 

Make necessary change to make things work with photon 2.0 docker image.
Remove distro-sync to mitigate the build issue and add `--pull` to docker build
command to make sure the latest photon:2.0 will be pulled during build process.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
This commit is contained in:
Daniel Jiang 2018-10-18 11:03:28 +08:00 committed by Yan
parent 31914c04ee
commit 3d09089a9c
16 changed files with 32 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/photon/Makefile
View File

@ -17,7 +17,7 @@ WGET=$(shell which wget)
# docker parameters # docker parameters
DOCKERCMD=$(shell which docker) DOCKERCMD=$(shell which docker)
DOCKERBUILD=$(DOCKERCMD) build DOCKERBUILD=$(DOCKERCMD) build --pull
DOCKERRMIMAGE=$(DOCKERCMD) rmi DOCKERRMIMAGE=$(DOCKERCMD) rmi
DOCKERIMASES=$(DOCKERCMD) images DOCKERIMASES=$(DOCKERCMD) images

6
make/photon/adminserver/Dockerfile
View File

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf erase vim -y \ RUN tdnf install -y sudo >> /dev/null \
&& tdnf distro-sync -y \
&& tdnf install -y sudo >> /dev/null \
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \
&& mkdir /harbor/ && mkdir /harbor/

7
make/photon/chartserver/Dockerfile
View File

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y shadow sudo >>/dev/null\
&& tdnf erase vim -y \
&& tdnf install -y git shadow sudo bzr rpm xz python-xml >>/dev/null\
&& tdnf clean all \ && tdnf clean all \
&& mkdir /chartserver/ \ && mkdir /chartserver/ \
&& groupadd -r -g 10000 chartuser \ && groupadd -r -g 10000 chartuser \
@ -17,7 +15,6 @@ RUN chown -R 10000:10000 /chartserver \
&& chmod u+x /chartserver/chartm \ && chmod u+x /chartserver/chartm \
&& chmod u+x /docker-entrypoint.sh && chmod u+x /docker-entrypoint.sh
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:9999/health || exit 1 HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:9999/health || exit 1
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

8
make/photon/clair/Dockerfile
View File

@ -1,9 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf install -y git shadow sudo rpm xz python-xml >>/dev/null\
RUN tdnf distro-sync -y \
&& tdnf erase vim -y \
&& tdnf install -y git shadow sudo bzr rpm xz python-xml >>/dev/null\
&& tdnf clean all \ && tdnf clean all \
&& mkdir /clair/ \ && mkdir /clair/ \
&& groupadd -r -g 10000 clair \ && groupadd -r -g 10000 clair \
@ -21,7 +18,6 @@ RUN chown -R 10000:10000 /clair \
&& chmod u+x /docker-entrypoint.sh \ && chmod u+x /docker-entrypoint.sh \
&& chmod +x /dumb-init && chmod +x /dumb-init
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:6061/health || exit 1 HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:6061/health || exit 1
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

6
make/photon/core/Dockerfile
View File

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install sudo -y >> /dev/null\
&& tdnf erase vim -y \
&& tdnf install sudo -y >> /dev/null\
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \
&& mkdir /harbor/ && mkdir /harbor/

10
make/photon/db/Dockerfile
View File

@ -1,12 +1,10 @@
FROM photon:1.0 FROM photon:2.0
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
RUN touch /etc/localtime.bak \ RUN tdnf install -y shadow gzip postgresql >> /dev/null\
&& tdnf distro-sync -y \
&& tdnf install -y sed shadow gzip postgresql >> /dev/null\
&& groupadd -r postgres --gid=999 \ && groupadd -r postgres --gid=999 \
&& useradd -r -g postgres --uid=999 postgres \ && useradd -m -r -g postgres --uid=999 postgres \
&& mkdir -p /docker-entrypoint-initdb.d \ && mkdir -p /docker-entrypoint-initdb.d \
&& mkdir -p /run/postgresql \ && mkdir -p /run/postgresql \
&& chown -R postgres:postgres /run/postgresql \ && chown -R postgres:postgres /run/postgresql \
@ -14,8 +12,6 @@ RUN touch /etc/localtime.bak \
&& mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \ && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
&& sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/share/postgresql/postgresql.conf.sample \ && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/share/postgresql/postgresql.conf.sample \
&& sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \ && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
&& touch /usr/share/locale/locale.alias \
&& locale-gen.sh en_US.UTF-8 \
&& tdnf clean all && tdnf clean all
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data

3
make/photon/db/docker-entrypoint.sh
View File

@ -29,16 +29,13 @@ fi
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
chown -R postgres:postgres $PGDATA chown -R postgres:postgres $PGDATA
echo here1
# look specifically for PG_VERSION, as it is expected in the DB dir # look specifically for PG_VERSION, as it is expected in the DB dir
if [ ! -s "$PGDATA/PG_VERSION" ]; then if [ ! -s "$PGDATA/PG_VERSION" ]; then
file_env 'POSTGRES_INITDB_ARGS' file_env 'POSTGRES_INITDB_ARGS'
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR" export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
fi fi
echo hehe2
su - $1 -c "initdb -D $PGDATA -U postgres -E UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8 $POSTGRES_INITDB_ARGS" su - $1 -c "initdb -D $PGDATA -U postgres -E UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8 $POSTGRES_INITDB_ARGS"
echo hehe3
# check password first so we can output the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'

3
make/photon/jobservice/Dockerfile
View File

@ -1,7 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN mkdir /harbor/ \ RUN mkdir /harbor/ \
&& tdnf distro-sync -y \
&& tdnf install sudo -y >> /dev/null\ && tdnf install sudo -y >> /dev/null\
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor

6
make/photon/log/Dockerfile
View File

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo >> /dev/null\
&& tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo net-tools >> /dev/null\
&& mkdir /etc/rsyslog.d/ \
&& mkdir /var/spool/rsyslog \ && mkdir /var/spool/rsyslog \
&& groupadd -r -g 10000 syslog && useradd --no-log-init -r -g 10000 -u 10000 syslog \ && groupadd -r -g 10000 syslog && useradd --no-log-init -r -g 10000 -u 10000 syslog \
&& tdnf clean all && tdnf clean all

5
make/photon/nginx/Dockerfile
View File

@ -1,7 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y nginx >> /dev/null\
&& tdnf install -y nginx >> /dev/null\
&& 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 \
&& tdnf clean all && tdnf clean all

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

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y shadow sudo \
&& tdnf erase vim -y \
&& tdnf install -y shadow sudo \
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 notary \ && groupadd -r -g 10000 notary \
&& useradd --no-log-init -r -g 10000 -u 10000 notary && useradd --no-log-init -r -g 10000 -u 10000 notary

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

@ -1,8 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y shadow sudo \
&& tdnf erase vim -y \
&& tdnf install -y shadow sudo \
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 notary \ && groupadd -r -g 10000 notary \
&& useradd --no-log-init -r -g 10000 -u 10000 notary && useradd --no-log-init -r -g 10000 -u 10000 notary

7
make/photon/portal/Dockerfile
View File

@ -14,10 +14,9 @@ RUN /entrypoint.sh
VOLUME ["/portal_src"] VOLUME ["/portal_src"]
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y nginx >> /dev/null \
&& tdnf install -y nginx >> /dev/null \
&& 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 \
&& tdnf clean all && tdnf clean all
@ -32,4 +31,4 @@ STOPSIGNAL SIGQUIT
HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

5
make/photon/redis/Dockerfile
View File

@ -1,7 +1,6 @@
FROM photon:1.0 FROM photon:2.0
RUN tdnf distro-sync -y \ RUN tdnf install -y redis sudo
&& tdnf install -y redis sudo
VOLUME /var/lib/redis VOLUME /var/lib/redis
WORKDIR /var/lib/redis WORKDIR /var/lib/redis

8
make/photon/registry/Dockerfile
View File

@ -1,11 +1,9 @@
FROM photon:1.0 FROM photon:2.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 \ RUN tdnf install sudo -y >> /dev/null\
&& tdnf erase vim -y \
&& tdnf install sudo -y >> /dev/null\
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor
@ -22,4 +20,4 @@ HEALTHCHECK CMD curl 127.0.0.1:5000/
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]
EXPOSE 5000 EXPOSE 5000
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["/etc/registry/config.yml"] CMD ["/etc/registry/config.yml"]

6
make/photon/registryctl/Dockerfile
View File

@ -1,10 +1,8 @@
FROM photon:1.0 FROM photon:2.0
MAINTAINER wangyan@vmware.com MAINTAINER wangyan@vmware.com
RUN tdnf distro-sync -y \ RUN tdnf install sudo -y >> /dev/null\
&& tdnf erase vim -y \
&& tdnf install sudo -y >> /dev/null\
&& tdnf clean all \ && tdnf clean all \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \
&& mkdir -p /etc/registry && mkdir -p /etc/registry