Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-24 01:27:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3621 from reasonerjt/deprivilege-harbor-core

Browse Source 
Fix issue in Docker files
This commit is contained in:
Yan 2017-11-16 18:10:42 +08:00 committed by GitHub
commit db6def3fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/photon/clair/Dockerfile
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

4
tools/migration/Dockerfile
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 \

2
tools/migration/run.sh
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