Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 442c1c6

Browse files
committed
upgrade to debian buster and mongodb 4.2
Switch to latest backend/frontend code which works with newer debian and mongodb. Also upgrade to match the /etc/linaro -> /etc/kernelci changes upstream. Signed-off-by: Kevin Hilman <[email protected]>
1 parent 34db878 commit 442c1c6

9 files changed

+22
-22
lines changed

backend/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM bitnami/minideb:jessie
1+
FROM bitnami/minideb:buster
22

33
# Install dependencies
4-
RUN install_packages git python python-pip python-dev build-essential wget
4+
RUN install_packages git python python-pip python-setuptools python-dev build-essential wget gnupg2
55
RUN pip install python-dateutil
66

77
# Install Node.js / nodemon
@@ -12,14 +12,14 @@ ENV PATH="/opt/bitnami/node/bin:$PATH"
1212
RUN npm install -g nodemon
1313

1414
# Install mongo shell
15-
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 \
16-
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list \
15+
RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \
16+
&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \
1717
&& apt-get update -y \
1818
&& apt-get install -y mongodb-org-shell
1919

2020
# Configuration
21-
RUN mkdir -p /etc/linaro
22-
COPY app/kernelci-backend.cfg /etc/linaro/kernelci-backend.cfg
21+
RUN mkdir -p /etc/kernelci
22+
COPY app/kernelci-backend.cfg /etc/kernelci/kernelci-backend.cfg
2323

2424
# Get source code
2525
COPY kernelci-backend /srv/kernelci-backend

backend/Dockerfile-celery

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN npm install -g nodemon
1111
RUN groupadd user && useradd --create-home --home-dir /home/user -g user user
1212

1313
# Configuration
14-
COPY celery/celery-config.cfg /etc/linaro/kernelci-celery.cfg
14+
COPY celery/celery-config.cfg /etc/kernelci/kernelci-celery.cfg
1515

1616
# Logs folder
1717
RUN mkdir -p /var/www/images/kernel-ci
1818

1919
# Give additional rights on /var/www
20-
RUN chown -R user:user /etc/linaro /var/www
20+
RUN chown -R user:user /etc/kernelci /var/www
2121

2222
# Copy backend source code and give rigth to user
2323
COPY kernelci-backend /home/user/kernelci-backend

backend/Dockerfile-celerybeat

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM bitnami/minideb:jessie
1+
FROM bitnami/minideb:buster
22

3-
RUN install_packages git python python-pip python-dev build-essential
3+
RUN install_packages git python python-pip python-setuptools python-dev build-essential
44
RUN pip install python-dateutil
55

6-
RUN mkdir -p /etc/linaro
7-
COPY celery-config.cfg /etc/linaro/kernelci-celery.cfg
6+
RUN mkdir -p /etc/kernelci
7+
COPY celery-config.cfg /etc/kernelci/kernelci-celery.cfg
88

99
RUN groupadd user && useradd --create-home --home-dir /home/user -g user user
1010

backend/kernelci-backend

Submodule kernelci-backend updated 184 files

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
restart: on-failure
1818
volumes:
1919
- $PWD/frontend/kernelci-frontend/app:/srv/kernelci-frontend/app
20-
- $PWD/frontend/flask_settings:/etc/linaro/kernelci-frontend.cfg
20+
- $PWD/frontend/flask_settings:/etc/kernelci/kernelci-frontend.cfg
2121
command: nodemon -V --watch /srv/kernelci-frontend/app -e py,html --exec "/bin/bash -c" /srv/entrypoint.sh
2222
backend:
2323
image: lucj/kernelci-backend:${TAG:-latest}
@@ -43,7 +43,7 @@ services:
4343
image: redis:3.2
4444
restart: on-failure
4545
mongo:
46-
image: mongo:3.4
46+
image: mongo:4.2
4747
restart: on-failure
4848
volumes:
4949
- data:/data/db

frontend/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM bitnami/minideb:jessie
1+
FROM bitnami/minideb:buster
22

33
# Install dependencies
44

5-
RUN install_packages build-essential git python python-pip python-dev uwsgi-plugin-python curl redis-tools wget
5+
RUN install_packages build-essential git python python-pip python-setuptools python-dev uwsgi-plugin-python curl redis-tools wget
66

77
# Install Node.js / nodemon
88
RUN wget --no-check-certificate -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/node-8.9.3-0-linux-x64-debian-8.tar.gz && \
@@ -18,7 +18,7 @@ COPY kernelci-frontend /srv/kernelci-frontend
1818
RUN pip install -r kernelci-frontend/requirements.txt
1919
WORKDIR /srv/kernelci-frontend/app
2020
RUN touch /etc/flask_settings
21-
COPY flask_settings /etc/linaro/kernelci-frontend.cfg
21+
COPY flask_settings /etc/kernelci/kernelci-frontend.cfg
2222

2323
# uWSGI configuration
2424

frontend/kernelci-frontend

Submodule kernelci-frontend updated 169 files

proxy/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ RUN node /front/app/dashboard/static/js/lib/r.js -o /front/app/dashboard/static/
88

99
# API documentation
1010

11-
FROM bitnami/minideb:jessie as backend
11+
FROM bitnami/minideb:buster as backend
1212

13-
RUN install_packages git python python-pip python-dev build-essential
13+
RUN install_packages git python python-pip python-setuptools python-dev build-essential
1414
RUN git clone https://github.com/kernelci/kernelci-backend.git /tmp/kernelci-backend
1515
RUN pip install -r /tmp/kernelci-backend/requirements.txt
1616
RUN cd /tmp/kernelci-backend/doc && make html

start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ docker config create $CONFIG config/frontend.config
7676

7777
### Update frontend with configuration
7878

79-
docker service update --config-add src=$CONFIG,target=/etc/linaro/kernelci-frontend.cfg kernelci_frontend
79+
docker service update --config-add src=$CONFIG,target=/etc/kernelci/kernelci-frontend.cfg kernelci_frontend
8080

8181
echo "-> application configured"
8282
echo "--> frontend available on port 8080"

0 commit comments

Comments
 (0)