Skip to content

Commit

Permalink
Updated the baseimage for all containers and changed the influxdb key…
Browse files Browse the repository at this point in the history
… link
  • Loading branch information
a-shashidharan committed Jan 10, 2024
1 parent 6b2879c commit cdc502e
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Build the APISERVER using phusion base image

FROM phusion/baseimage:master-amd64
FROM phusion/baseimage:jammy-1.0.1

# Enabling SSH service
RUN rm -f /etc/service/sshd/down
Expand Down
19 changes: 10 additions & 9 deletions backup/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ RUN env | grep MON > /root/env


# Building cron-backup instance
FROM phusion/baseimage:master-amd64
FROM phusion/baseimage:jammy-1.0.1
# Copying mongodb's version
COPY --from=mongodb /root/env /root/env

# Installing same Mongodb's tools as in the copied version here in the cron-backup instance
RUN set -x \
&& export $(xargs < /root/env) \
&& echo "deb http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list" \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B00A0BD1E2C63C11 \
&& export DEBIAN_FRONTEND=noninteractive && apt-get update && ln -s /bin/true /usr/local/bin/systemctl && apt-get install -y \
${MONGO_PACKAGE}=$MONGO_VERSION \
${MONGO_PACKAGE}-tools=$MONGO_VERSION

&& echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list.d/focal-security.list \
&& apt-get install -y gpg curl \
&& curl -fsSL https://pgp.mongodb.com/server-7.0.asc | \
gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \
--dearmor\
&& echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list\
&& apt-get update \
&& apt-get install -y mongodb-org mongodb-org-database mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools

# some basic package installation for troubleshooting
RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -94,4 +95,4 @@ RUN mkdir -p /etc/my_init.d
COPY postfix.sh /etc/my_init.d/postfix.sh
RUN chmod +x /etc/my_init.d/postfix.sh

# end of file
# end of file
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ services:
- "${IOT_DASHBOARD_DATA}node-red:/data"
environment:
TZ: "${IOT_DASHBOARD_TIMEZONE:-GMT}"
NODE_RED_ENABLE_PROJECTS: "true"
# nodered opens ports on influxdb and postfix so it needs to be able to talk to it.
links:
- influxdb
Expand Down
2 changes: 1 addition & 1 deletion expo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Build the EXPO using phusion base image

FROM phusion/baseimage:master-amd64
FROM phusion/baseimage:jammy-1.0.1

# Enabling SSH service
RUN rm -f /etc/service/sshd/down
Expand Down
6 changes: 3 additions & 3 deletions influxdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Dockerfile for building the influxdb instance with S3-backup and Mail alert setup
#

FROM phusion/baseimage:master-amd64
FROM phusion/baseimage:jammy-1.0.1

# Default InfluxDB host
ENV INFLUX_HOST=influxdb
Expand All @@ -13,7 +13,7 @@ ARG distrib_id
ARG distrib_codename

RUN echo "${distrib_id}"
RUN wget -qO- https://repos.influxdata.com/influxdb.key | apt-key add -
RUN wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | apt-key add -
RUN /bin/bash -c "source /etc/lsb-release"
RUN echo "deb https://repos.influxdata.com/${distrib_id} ${distrib_codename} stable" | tee /etc/apt/sources.list.d/influxdb.list

Expand Down Expand Up @@ -75,4 +75,4 @@ RUN chmod +x /etc/service/influx/run
COPY influxstart.sh /etc/service/influxstart/run
RUN chmod +x /etc/service/influxstart/run

# end of file
# end of file
3 changes: 1 addition & 2 deletions mqtts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#

# Build the MQTTS using phusion base image
FROM phusion/baseimage:master-amd64

FROM phusion/baseimage:jammy-1.0.1
# Installing mosquitto packages and certbot
RUN apt-add-repository ppa:mosquitto-dev/mosquitto-ppa
RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#

# Start from Phusion.
FROM phusion/baseimage:master-amd64

FROM phusion/baseimage:jammy-1.0.1
# Installing the required packages
RUN apt-get update && apt-get install -y \
software-properties-common \
Expand Down
2 changes: 1 addition & 1 deletion node-red/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ COPY settings.js /usr/src/node-red/.node-red/
# change the startup command to be sure to use our settings.
CMD ["npm", "start", "--", "--userDir", "/data", "--settings", "/usr/src/node-red/.node-red/settings.js"]

# end of file
# end of file
2 changes: 1 addition & 1 deletion postfix/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Dockerfile for building POSTFIX
#
# Build the Postfix using phusion base image
FROM phusion/baseimage:master-amd64

FROM phusion/baseimage:jammy-1.0.1
# some basic package installation for troubleshooting
RUN apt-get update && apt-get install -y \
iputils-ping \
Expand Down

0 comments on commit cdc502e

Please sign in to comment.