Skip to content

Commit

Permalink
Merge 063e44c into d4b17d4
Browse files Browse the repository at this point in the history
  • Loading branch information
wy65701436 committed Aug 8, 2018
2 parents d4b17d4 + 063e44c commit 41587c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion make/photon/registryctl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM photon:1.0

MAINTAINER wangyan@vmware.com

RUN tdnf distro-sync -y || echo \
RUN tdnf distro-sync -y \
&& tdnf erase vim -y \
&& tdnf install sudo -y >> /dev/null\
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion tools/migration/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM photon:1.0
ENV PGDATA /var/lib/postgresql/data

## have both mysql and pgsql installed.
RUN tdnf distro-sync -y || echo \
RUN tdnf distro-sync -y \
&& 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 \
&& tdnf install -y mariadb-server mariadb mariadb-devel python2 python2-devel python-pip gcc \
Expand Down

0 comments on commit 41587c7

Please sign in to comment.