diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile index 5738789e4..0e165b00e 100644 --- a/make/photon/clair/Dockerfile +++ b/make/photon/clair/Dockerfile @@ -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 diff --git a/tools/migration/Dockerfile b/tools/migration/Dockerfile index 7ed3b2716..ac0a8de45 100644 --- a/tools/migration/Dockerfile +++ b/tools/migration/Dockerfile @@ -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 \ diff --git a/tools/migration/run.sh b/tools/migration/run.sh index fdbe38c3f..1586ed5ee 100755 --- a/tools/migration/run.sh +++ b/tools/migration/run.sh @@ -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