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

Merge pull request #6384 from SDBrett/photon-build

Browse Source 
Corrected errors in photon build
This commit is contained in:
James Zabala 2018-11-29 18:08:52 -05:00 committed by GitHub
commit 399c9c44d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/photon/portal/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:10.7.0 FROM node:10.7.0 as nodeportal
RUN mkdir -p /portal_src RUN mkdir -p /portal_src
RUN mkdir -p /build_dir RUN mkdir -p /build_dir
@ -24,7 +24,7 @@ RUN tdnf install -y nginx >> /dev/null \
EXPOSE 80 EXPOSE 80
VOLUME /var/cache/nginx /var/log/nginx /run VOLUME /var/cache/nginx /var/log/nginx /run
COPY --from=0 /build_dir/dist /usr/share/nginx/html COPY --from=nodeportal /build_dir/dist /usr/share/nginx/html
COPY make/photon/portal/nginx.conf /etc/nginx/nginx.conf COPY make/photon/portal/nginx.conf /etc/nginx/nginx.conf
STOPSIGNAL SIGQUIT STOPSIGNAL SIGQUIT

2
tools/migration/Dockerfile
View File

@ -7,7 +7,7 @@ RUN tdnf distro-sync -y \
&& tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools >> /dev/null\ && tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools >> /dev/null\
&& groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \ && groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \
&& tdnf install -y mariadb-server mariadb mariadb-devel python2 python2-devel python-pip gcc \ && tdnf install -y mariadb-server mariadb mariadb-devel python2 python2-devel python-pip gcc \
linux-api-headers glibc-devel binutils zlib-devel openssl-devel postgresql >> /dev/null\ linux-api-headers glibc-devel binutils zlib-devel openssl-devel postgresql >> /dev/null \
&& pip install mysqlclient alembic psycopg2 \ && pip install mysqlclient alembic psycopg2 \
&& mkdir /docker-entrypoint-initdb.d /docker-entrypoint-updatedb.d \ && mkdir /docker-entrypoint-initdb.d /docker-entrypoint-updatedb.d \
&& rm -fr /var/lib/mysql \ && rm -fr /var/lib/mysql \