mirror of
https://github.com/goharbor/harbor
synced 2024-09-20 19:29:54 +00:00
Fix issue in Docker files
1)Fix a syntax error in clair Dockerfile 2)Fix permission issue in database migrator image.
This commit is contained in:
parent
ef14b1f308
commit
1f5a9cdee8
|
@ -10,7 +10,7 @@ RUN tdnf distro-sync -y \
|
||||||
&& useradd --no-log-init -m -r -g 10000 -u 10000 clair
|
&& useradd --no-log-init -m -r -g 10000 -u 10000 clair
|
||||||
COPY clair /clair2.0.1/
|
COPY clair /clair2.0.1/
|
||||||
COPY docker-entrypoint.sh /docker-entrypoint.sh
|
COPY docker-entrypoint.sh /docker-entrypoint.sh
|
||||||
COPY dumb-init /dumb-init \
|
COPY dumb-init /dumb-init
|
||||||
|
|
||||||
VOLUME /config
|
VOLUME /config
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ EXPOSE 6060 6061
|
||||||
|
|
||||||
RUN chown -R 10000:10000 /clair2.0.1 \
|
RUN chown -R 10000:10000 /clair2.0.1 \
|
||||||
&& chmod u+x /clair2.0.1/clair \
|
&& chmod u+x /clair2.0.1/clair \
|
||||||
&& chmod u+x /docker-entrypoint.sh
|
&& chmod u+x /docker-entrypoint.sh \
|
||||||
&& chmod +x /dumb-init
|
&& chmod +x /dumb-init
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM vmware/mariadb-photon:10.2.8
|
FROM vmware/mariadb-photon:10.2.8
|
||||||
|
|
||||||
RUN tdnf distro-sync \
|
RUN tdnf distro-sync -y \
|
||||||
&& tdnf install -y mariadb-devel python2 python2-devel python-pip gcc\
|
&& tdnf install -y mariadb-devel python2 python2-devel python-pip gcc \
|
||||||
linux-api-headers glibc-devel binutils zlib-devel openssl-devel \
|
linux-api-headers glibc-devel binutils zlib-devel openssl-devel \
|
||||||
&& pip install mysqlclient alembic \
|
&& pip install mysqlclient alembic \
|
||||||
&& tdnf clean all \
|
&& tdnf clean all \
|
||||||
|
|
|
@ -40,7 +40,7 @@ if [[ ( $1 = "up" || $1 = "upgrade" ) && ${SKIP_CONFIRM} != "y" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo 'Trying to start mysql server...'
|
echo 'Trying to start mysql server...'
|
||||||
DBRUN=0
|
chown -R 10000:10000 /var/lib/mysql
|
||||||
mysqld &
|
mysqld &
|
||||||
for i in {60..0}; do
|
for i in {60..0}; do
|
||||||
mysqladmin -u$DB_USR -p$DB_PWD processlist >/dev/null 2>&1
|
mysqladmin -u$DB_USR -p$DB_PWD processlist >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user