jan/cacert-devsetup
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: jan:run-locally
Branches Tags
jan:master
jan:run-locally
jan:use-gosigner
jan:old_signer_image
..
compare: jan:master
Branches Tags
jan:run-locally
jan:master
jan:use-gosigner
jan:old_signer_image

No commits in common. "run-locally" and "master" have entirely different histories.
run-locall ... master

9 changed files with 15 additions and 42 deletions
Show stats Expand all files Collapse all files

3
.mrconfig
View file

@ -5,5 +5,4 @@ checkout = git clone https://github.com/CAcertOrg/cats cacert-cats
checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-mgr.git cacert-mgr
[cacert-software]
#checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software
checkout = git clone -b run-locally https://github.com/jandd/cacert-devel.git cacert-software
checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software

8
cats.Dockerfile
View file

@ -1,10 +1,6 @@
FROM debian/eol:jessie
FROM debian:jessie
RUN sed -i \
-e 's@\(^deb http://deb\..*\)$@#\1@' \
-e 's@\(^deb http://security\..*\)$@deb http://archive.debian.org/debian-security jessie/updates main@' \
/etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
ca-certificates \

3
docker-compose.yml
View file

@ -42,7 +42,6 @@ services:
CRL_DIRECTORY: /srv/certs/crl
DEFAULT_HOSTNAME: www.cacert.localhost
SECURE_HOSTNAME: secure.cacert.localhost
TVERIFY_HOSTNAME: tverify.cacert.localhost
INSECURE_PORT: 8080
SECURE_PORT: 8443
RETURN_ADDRESS: "returns@cacert.localhost"
@ -102,7 +101,6 @@ services:
volumes:
- certstaging:/srv/certs
- signersockets:/srv/sockets
- webdbincl:/home/cacert/www/includes/
depends_on:
- db
- smtp
@ -129,4 +127,3 @@ volumes:
certstaging: { }
signersockets: { }
signerdata: { }
webdbincl: { }

2
docker/run-signer
View file

@ -23,7 +23,7 @@ if [ ! -f /srv/ca/gpg/gpg_root_0/secring.gpg ]; then cp /srv/testca/gpg/gpg_root
if [ ! -f /srv/ca/gpg/gpg_root_0/pubring.gpg ]; then cp /srv/testca/gpg/gpg_root_0/pubring.gpg /srv/ca/gpg/gpg_root_0/pubring.gpg; fi
rm -f /srv/sockets/signer
socat -d -d "PTY,link=${SERIAL_PORT}" UNIX-LISTEN:/srv/sockets/signer 2>&1 &
socat -d -d PTY,link=/dev/ttyUSB0 UNIX-LISTEN:/srv/sockets/signer 2>&1 &
sleep 1
cd /srv/CommModule/

6
docker/run-signer_client
View file

@ -2,12 +2,10 @@
set -eu
export SERIAL_PORT=/dev/ttyUSB0
socat -d -d "UNIX:/srv/sockets/signer" "PTY,link=${SERIAL_PORT}" 2>&1 &
socat -d -d UNIX:/srv/sockets/signer PTY,link=/dev/ttyS0 2>&1 &
sleep 1
echo "<?php mysql_connect(\"${MYSQL_WEBDB_HOSTNAME}\", \"${MYSQL_WEBDB_USER}\", \"${MYSQL_WEBDB_PASSWORD}\");" > "/home/cacert/www/includes/mysql.php"
export SERIAL_PORT=/dev/ttyS0
cd /srv/CommModule/

8
mgr.Dockerfile
View file

@ -1,10 +1,6 @@
FROM debian/eol:jessie
FROM debian:jessie
RUN sed -i \
-e 's@\(^deb http://deb\..*\)$@#\1@' \
-e 's@\(^deb http://security\..*\)$@deb http://archive.debian.org/debian-security jessie/updates main@' \
/etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
ca-certificates \

8
signer.Dockerfile
View file

@ -1,10 +1,6 @@
FROM debian/eol:jessie
FROM debian:jessie
RUN sed -i \
-e 's@\(^deb http://deb\..*\)$@#\1@' \
-e 's@\(^deb http://security\..*\)$@deb http://archive.debian.org/debian-security jessie/updates main@' \
/etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
gnupg \

8
signer_client.Dockerfile
View file

@ -1,13 +1,9 @@
FROM debian/eol:jessie
FROM debian:jessie
COPY testca/root/ca.crt.pem /usr/local/share/ca-certificates/testca_root.crt
COPY testca/class3/ca.crt.pem /usr/local/share/ca-certificates/testca_class3.crt
RUN sed -i \
-e 's@\(^deb http://deb\..*\)$@#\1@' \
-e 's@\(^deb http://security\..*\)$@deb http://archive.debian.org/debian-security jessie/updates main@' \
/etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
ca-certificates \

9
webdb.Dockerfile
View file

@ -1,10 +1,6 @@
FROM debian/eol:jessie
FROM debian:jessie
RUN sed -i \
-e 's@\(^deb http://deb\..*\)$@#\1@' \
-e 's@\(^deb http://security\..*\)$@deb http://archive.debian.org/debian-security jessie/updates main@' \
/etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
ca-certificates \
@ -39,7 +35,6 @@ RUN sed -i \
php5-recode \
psmisc \
wamerican \
wget \
whois \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \