Skip to content

Commit 03a9040

Browse files
committed
dockerfile; startup script
1 parent 362c498 commit 03a9040

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

express4/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

express5/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

fastify3/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

fastify4/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

hapi20/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

hapi21/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

koa/screener.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rethinkdb --daemon
2424
echo "Starting MySQL"
2525
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"password"}
2626
MYSQL_DATABASE=${MYSQL_DATABASE:-"testdb"}
27-
service mysql start
27+
service mariadb start
2828

2929
mysql --version
3030
mysql -uroot -ppassword -e "drop database if exists $MYSQL_DATABASE"

scripts/Dockerfile-screener

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:noble
1+
FROM ubuntu:jammy
22

33
ARG node_version=14
44
ARG DEBIAN_FRONTEND=noninteractive
@@ -22,21 +22,21 @@ RUN apt update
2222
RUN apt-get -y install sudo
2323

2424
# Add PostgreSQL repository and install PostgreSQL 11
25-
RUN echo "deb https://apt.postgresql.org/pub/repos/apt/ noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
25+
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
2626
curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
2727
apt-get update && \
28-
apt-get install -y postgresql postgresql-contrib postgresql-client
28+
apt-get install -y postgresql-11 postgresql-contrib-11 postgresql-client
2929

3030
# Configure such that remote connections to the database are possible.
31-
RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/17/main/pg_hba.conf
32-
RUN echo "listen_addresses='*'" >> /etc/postgresql/17/main/postgresql.conf
31+
RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/11/main/pg_hba.conf
32+
RUN echo "listen_addresses='*'" >> /etc/postgresql/11/main/postgresql.conf
3333

3434
# Add VOLUMEs to allow backup of config, logs and databases
3535
VOLUME ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
3636
EXPOSE 5432
3737

3838
# RethinkDB
39-
RUN echo "deb https://download.rethinkdb.com/repository/ubuntu-noble noble main" > /etc/apt/sources.list.d/rethinkdb.list
39+
RUN echo "deb https://download.rethinkdb.com/repository/ubuntu-jammy jammy main" > /etc/apt/sources.list.d/rethinkdb.list
4040
RUN wget -qO- https://download.rethinkdb.com/repository/raw/pubkey.gpg | sudo apt-key add -v - && apt-get update && apt-get install -y rethinkdb
4141
RUN rm -rf /var/lib/apt/lists/*
4242
VOLUME ["/etc/rethinkdb", "/var/log/rethinkdb", "/var/lib/rethinkdb"]
@@ -48,6 +48,7 @@ RUN wget http://repo.mysql.com/mysql-apt-config_0.8.34-1_all.deb
4848
RUN apt update
4949
RUN apt install -y lsb-release ./mysql-apt-config_0.8.34-1_all.deb
5050
RUN apt install mariadb-server mariadb-client -y
51+
RUN apt --fix-broken install
5152
VOLUME ["/etc/mysql", "/var/lib/mysql"]
5253
EXPOSE 3306
5354

@@ -65,7 +66,7 @@ EXPOSE 8
6566
RUN apt-get update && \
6667
apt-get install -y gnupg curl && \
6768
curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - && \
68-
echo "deb http://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \
69+
echo "deb http://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \
6970
apt-get update
7071

7172
# Install MongoDB

0 commit comments

Comments
 (0)