Skip to content

Commit 856f10e

Browse files
bukunbukun
committed
podman tester.
1 parent 1642b80 commit 856f10e

15 files changed

+124
-48
lines changed

‎docker/Debian/builit.sh

-15
This file was deleted.

‎docker/Debian/builit_ubu22.sh

-10
This file was deleted.

‎docker/Debian/Dockerfile_deb11 renamed to ‎docker/Dockerfile_deb11

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
FROM debian:11
2-
# bullseye
32

43
MAINTAINER bukun <bukun@osgeo.cn>
54

5+
ENV DEBIAN_FRONTEND noninteractive
6+
67
# RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
78
# RUN echo "zh_CN.UTF-8 UTF-8" >> /etc/locale.gen
89
# RUN locale-gen
@@ -25,16 +26,6 @@ RUN echo "trusted-host=mirrors.aliyun.com" >> ~/.pip/pip.conf
2526
##############################################################################
2627
RUN apt update && apt -y dist-upgrade && apt install -y git locales python3-pip redis-server python3-venv postgresql-server-dev-all libpq-dev postgresql postgresql-contrib redis-server sudo
2728

28-
######################################
29-
30-
##############################################################################
31-
32-
33-
# RUN ln -sf /bin/bash /bin/sh
34-
# RUN useradd -ms /bin/bash bk
35-
########################################################
36-
37-
# USER bk
3829

3930
RUN python3 -m venv /vpy
4031

‎docker/Dockerfile_deb12

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
FROM debian:12
2+
3+
MAINTAINER bukun <bukun@osgeo.cn>
4+
5+
ENV DEBIAN_FRONTEND noninteractive
6+
7+
# RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
8+
# RUN echo "zh_CN.UTF-8 UTF-8" >> /etc/locale.gen
9+
# RUN locale-gen
10+
# ENV LANG en_US.UTF-8
11+
# ENV LANGUAGE en_US:en
12+
# ENV LC_ALL en_US.UTF-8
13+
14+
RUN echo "deb http://mirrors.163.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list
15+
RUN echo "deb http://mirrors.163.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list
16+
RUN echo "deb http://mirrors.163.com/debian-security bullseye-security main" >> /etc/apt/sources.list
17+
RUN echo "deb http://mirrors.163.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list
18+
19+
20+
#########################################
21+
RUN mkdir ~/.pip
22+
RUN echo "[global]" > ~/.pip/pip.conf
23+
RUN echo "index-url = http://mirrors.aliyun.com/pypi/simple" >> ~/.pip/pip.conf
24+
RUN echo "[install]" >> ~/.pip/pip.conf
25+
RUN echo "trusted-host=mirrors.aliyun.com" >> ~/.pip/pip.conf
26+
##############################################################################
27+
RUN apt update && apt -y dist-upgrade && apt install -y git locales python3-pip redis-server python3-venv postgresql-server-dev-all libpq-dev postgresql postgresql-contrib redis-server sudo
28+
29+
30+
31+
RUN python3 -m venv /vpy
32+
33+
34+
RUN mkdir /coding
35+
WORKDIR /coding
36+
37+
RUN git clone https://gitee.com/bukun/TorCMS.git
38+
39+
WORKDIR /coding/TorCMS
40+
41+
RUN /vpy/bin/python3 -m pip install wheel
42+
RUN /vpy/bin/python3 -m pip install -r doc/requirements.txt
43+
RUN /vpy/bin/python3 -m pip install -r doc/requirements-dev.txt
44+
RUN /vpy/bin/python3 -m pip install email_validator django wtforms
45+

‎docker/Debian/Dockerfile_ubu22 renamed to ‎docker/Dockerfile_ubu22

-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM ubuntu:22.04
2-
# bullseye
32

43
MAINTAINER bukun <bukun@osgeo.cn>
54

@@ -24,17 +23,6 @@ RUN apt update && apt -y dist-upgrade
2423
RUN apt install -y git python3-pip redis-server python3-venv postgresql-server-dev-all libpq-dev postgresql postgresql-contrib redis-server sudo
2524

2625

27-
######################################
28-
29-
##############################################################################
30-
31-
32-
# RUN ln -sf /bin/bash /bin/sh
33-
# RUN useradd -ms /bin/bash bk
34-
########################################################
35-
36-
# USER bk
37-
3826
RUN python3 -m venv /vpy
3927

4028

‎docker/Dockerfile_ubu24

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM ubuntu:24.04
2+
3+
MAINTAINER bukun <bukun@osgeo.cn>
4+
5+
ENV DEBIAN_FRONTEND noninteractive
6+
7+
# RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
8+
# RUN echo "zh_CN.UTF-8 UTF-8" >> /etc/locale.gen
9+
# RUN locale-gen
10+
# ENV LANG en_US.UTF-8
11+
# ENV LANGUAGE en_US:en
12+
# ENV LC_ALL en_US.UTF-8
13+
14+
15+
#########################################
16+
RUN mkdir ~/.pip
17+
RUN echo "[global]" > ~/.pip/pip.conf
18+
RUN echo "index-url = http://mirrors.aliyun.com/pypi/simple" >> ~/.pip/pip.conf
19+
RUN echo "[install]" >> ~/.pip/pip.conf
20+
RUN echo "trusted-host=mirrors.aliyun.com" >> ~/.pip/pip.conf
21+
##############################################################################
22+
RUN apt update && apt -y dist-upgrade
23+
RUN apt install -y git python3-pip redis-server python3-venv postgresql-server-dev-all libpq-dev postgresql postgresql-contrib redis-server sudo
24+
25+
RUN python3 -m venv /vpy
26+
27+
RUN mkdir /coding
28+
WORKDIR /coding
29+
30+
RUN git clone https://gitee.com/bukun/TorCMS.git
31+
32+
WORKDIR /coding/TorCMS
33+
34+
RUN /vpy/bin/python3 -m pip install wheel
35+
RUN /vpy/bin/python3 -m pip install -r doc/requirements.txt
36+
RUN /vpy/bin/python3 -m pip install -r doc/requirements-dev.txt
37+
RUN /vpy/bin/python3 -m pip install email_validator django wtforms
38+
39+
40+

‎docker/Debian/ReadMe.md renamed to ‎docker/ReadMe.md

File renamed without changes.

‎docker/builit_deb11.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
podman build -t torcms-debian11 -f Dockerfile_deb11
4+
5+
rm ../../admin_torcms/migrations/00*.py
6+
7+
podman run -it -v ../../../TorCMS:/coding/TorCMS bk-torcms-debian11 bash -c \
8+
"/etc/init.d/postgresql start && sudo -u postgres psql -c \"CREATE ROLE torcms WITH LOGIN PASSWORD '111111';\" && sudo -u postgres psql -c \"CREATE DATABASE torcms WITH OWNER torcms;\" && /vpy/bin/python manage.py makemigrations && /vpy/bin/python manage.py migrate && /vpy/bin/python3 helper.py -i init && /vpy/bin/python3 -m pytest torcms/tests"
9+
10+

‎docker/builit_deb12.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
podman build -t torcms-debian12 -f Dockerfile_deb12
4+
5+
rm ../../admin_torcms/migrations/00*.py
6+
7+
podman run -it -v ../../../TorCMS:/coding/TorCMS bk-torcms-debian12 bash -c \
8+
"/etc/init.d/postgresql start && sudo -u postgres psql -c \"CREATE ROLE torcms WITH LOGIN PASSWORD '111111';\" && sudo -u postgres psql -c \"CREATE DATABASE torcms WITH OWNER torcms;\" && /vpy/bin/python manage.py makemigrations && /vpy/bin/python manage.py migrate && /vpy/bin/python3 helper.py -i init && /vpy/bin/python3 -m pytest torcms/tests"
9+

‎docker/builit_ubu22.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
podman build -t torcms-ubun22 -f Dockerfile_ubu22
4+
5+
rm ../../admin_torcms/migrations/00*.py
6+
7+
podman run -it -v ../../../TorCMS:/coding/TorCMS bk-torcms-ubun22 bash -c \
8+
"/etc/init.d/postgresql start && sudo -u postgres psql -c \"CREATE ROLE torcms WITH LOGIN PASSWORD '111111';\" && sudo -u postgres psql -c \"CREATE DATABASE torcms WITH OWNER torcms;\" && /vpy/bin/python manage.py makemigrations && /vpy/bin/python manage.py migrate && /vpy/bin/python3 helper.py -i init && /vpy/bin/python3 -m pytest torcms/tests"
9+

‎docker/builit_ubu24.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
podman build -t torcms-ubun24 -f Dockerfile_ubu24
4+
5+
rm ../../admin_torcms/migrations/00*.py
6+
7+
podman run -it -v ../../../TorCMS:/coding/TorCMS bk-torcms-ubun24 bash -c \
8+
"/etc/init.d/postgresql start && sudo -u postgres psql -c \"CREATE ROLE torcms WITH LOGIN PASSWORD '111111';\" && sudo -u postgres psql -c \"CREATE DATABASE torcms WITH OWNER torcms;\" && /vpy/bin/python manage.py makemigrations && /vpy/bin/python manage.py migrate && /vpy/bin/python3 helper.py -i init && /vpy/bin/python3 -m pytest torcms/tests"
9+

‎docker/Debian/cfg_demo.py renamed to ‎docker/cfg_demo.py

File renamed without changes.

‎docker/Debian/docker-compose.yml renamed to ‎docker/docker-compose.yml

File renamed without changes.

‎docker/Debian/run.sh renamed to ‎docker/run.sh

File renamed without changes.

‎docker/Debian/run_test.sh renamed to ‎docker/run_test.sh

File renamed without changes.

0 commit comments

Comments
 (0)