Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump up photon version from 4.0 to 5.0 #19006

Merged
merged 1 commit into from
Aug 1, 2023
Merged

Bump up photon version from 4.0 to 5.0 #19006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion make/photon/core/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y tzdata shadow >> /dev/null \
&& tdnf clean all \
Expand Down
10 changes: 6 additions & 4 deletions make/photon/db/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM photon:4.0
FROM photon:5.0

ENV PGDATA /var/lib/postgresql/data

RUN tdnf install -y postgresql13 >> /dev/null
RUN tdnf install -y shadow gzip postgresql findutils bc >> /dev/null \
RUN tdnf install -y shadow >> /dev/null \
&& groupadd -r postgres --gid=999 \
&& useradd -m -r -g postgres --uid=999 postgres \
&& useradd -m -r -g postgres --uid=999 postgres

RUN tdnf install -y postgresql13-server >> /dev/null
RUN tdnf install -y gzip postgresql14-server findutils bc >> /dev/null \
&& mkdir -p /docker-entrypoint-initdb.d \
&& mkdir -p /run/postgresql \
&& chown -R postgres:postgres /run/postgresql \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/exporter/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y tzdata shadow >> /dev/null \
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/jobservice/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y tzdata shadow >> /dev/null \
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/log/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo >> /dev/null\
&& mkdir /var/spool/rsyslog \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/nginx/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y nginx shadow >> /dev/null \
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/portal/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y nginx shadow >> /dev/null \
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/prepare/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y python3 python3-pip python3-PyYAML python3-jinja2 && tdnf clean all
RUN pip3 install pipenv==2022.1.8
Expand Down
5 changes: 4 additions & 1 deletion make/photon/redis/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y shadow >> /dev/null \
&& groupadd -g 999 redis \
&& useradd -u 999 -g 999 -c "Redis Database Server" -d /var/lib/redis -s /sbin/nologin -m redis
RUN tdnf install -y redis && tdnf clean all
4 changes: 2 additions & 2 deletions make/photon/registry/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y shadow >> /dev/null \
&& tdnf clean all \
&& mkdir -p /etc/registry \
&& groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
&& groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
2 changes: 1 addition & 1 deletion make/photon/registryctl/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y shadow >> /dev/null \
&& tdnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/trivy-adapter/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM photon:4.0
FROM photon:5.0

RUN tdnf install -y rpm shadow >> /dev/null \
&& tdnf clean all \
Expand Down
Loading