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:
reasonerjt 2017-11-16 01:15:59 -08:00
parent ef14b1f308
commit 1f5a9cdee8
3 changed files with 5 additions and 5 deletions

View File

@ -10,7 +10,7 @@ RUN tdnf distro-sync -y \
&& useradd --no-log-init -m -r -g 10000 -u 10000 clair
COPY clair /clair2.0.1/
COPY docker-entrypoint.sh /docker-entrypoint.sh
COPY dumb-init /dumb-init \
COPY dumb-init /dumb-init
VOLUME /config
@ -18,7 +18,7 @@ EXPOSE 6060 6061
RUN chown -R 10000:10000 /clair2.0.1 \
&& chmod u+x /clair2.0.1/clair \
&& chmod u+x /docker-entrypoint.sh
&& chmod u+x /docker-entrypoint.sh \
&& chmod +x /dumb-init

View File

@ -1,7 +1,7 @@
FROM vmware/mariadb-photon:10.2.8
RUN tdnf distro-sync \
&& tdnf install -y mariadb-devel python2 python2-devel python-pip gcc\
RUN tdnf distro-sync -y \
&& tdnf install -y mariadb-devel python2 python2-devel python-pip gcc \
linux-api-headers glibc-devel binutils zlib-devel openssl-devel \
&& pip install mysqlclient alembic \
&& tdnf clean all \

View File

@ -40,7 +40,7 @@ if [[ ( $1 = "up" || $1 = "upgrade" ) && ${SKIP_CONFIRM} != "y" ]]; then
fi
echo 'Trying to start mysql server...'
DBRUN=0
chown -R 10000:10000 /var/lib/mysql
mysqld &
for i in {60..0}; do
mysqladmin -u$DB_USR -p$DB_PWD processlist >/dev/null 2>&1