forked from public/pyceo
use bullseye for base container (#91)
All of the machines running ceod are on bullseye, so we don't need to support buster anymore. Reviewed-on: public/pyceo#91 Co-authored-by: Max Erenberg <merenber@csclub.uwaterloo.ca> Co-committed-by: Max Erenberg <merenber@csclub.uwaterloo.ca>
This commit is contained in:
parent
b507c56136
commit
4394c4e277
|
@ -5,7 +5,7 @@ name: default
|
||||||
steps:
|
steps:
|
||||||
# use the step name to mock out the gethostname() call in our tests
|
# use the step name to mock out the gethostname() call in our tests
|
||||||
- name: phosphoric-acid
|
- name: phosphoric-acid
|
||||||
image: python:3.7-buster
|
image: python:3.9-bullseye
|
||||||
# unfortunately we have to do everything in one step because there's no
|
# unfortunately we have to do everything in one step because there's no
|
||||||
# way to share system packages between steps
|
# way to share system packages between steps
|
||||||
commands:
|
commands:
|
||||||
|
@ -25,12 +25,12 @@ steps:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- name: auth1
|
- name: auth1
|
||||||
image: debian:buster
|
image: debian:bullseye
|
||||||
commands:
|
commands:
|
||||||
- .drone/auth1-setup.sh
|
- .drone/auth1-setup.sh
|
||||||
- sleep infinity
|
- sleep infinity
|
||||||
- name: coffee
|
- name: coffee
|
||||||
image: debian:buster
|
image: debian:bullseye
|
||||||
commands:
|
commands:
|
||||||
- .drone/coffee-setup.sh
|
- .drone/coffee-setup.sh
|
||||||
- sleep infinity
|
- sleep infinity
|
||||||
|
|
|
@ -28,7 +28,6 @@ killall slapd || true
|
||||||
service nslcd stop || true
|
service nslcd stop || true
|
||||||
rm -rf /etc/ldap/slapd.d
|
rm -rf /etc/ldap/slapd.d
|
||||||
rm /var/lib/ldap/*
|
rm /var/lib/ldap/*
|
||||||
cp /usr/share/slapd/DB_CONFIG /var/lib/ldap/DB_CONFIG
|
|
||||||
cp .drone/slapd.conf /etc/ldap/slapd.conf
|
cp .drone/slapd.conf /etc/ldap/slapd.conf
|
||||||
cp .drone/ldap.conf /etc/ldap/ldap.conf
|
cp .drone/ldap.conf /etc/ldap/ldap.conf
|
||||||
cp /usr/share/doc/sudo-ldap/schema.OpenLDAP /etc/ldap/schema/sudo.schema
|
cp /usr/share/doc/sudo-ldap/schema.OpenLDAP /etc/ldap/schema/sudo.schema
|
||||||
|
|
|
@ -11,9 +11,9 @@ add_fqdn_to_hosts $(get_ip_addr auth1) auth1
|
||||||
apt install --no-install-recommends -y default-mysql-server postgresql
|
apt install --no-install-recommends -y default-mysql-server postgresql
|
||||||
|
|
||||||
# MYSQL
|
# MYSQL
|
||||||
service mysql stop
|
service mariadb stop
|
||||||
sed -E -i 's/^(bind-address[[:space:]]+= 127.0.0.1)$/#\1/' /etc/mysql/mariadb.conf.d/50-server.cnf
|
sed -E -i 's/^(bind-address[[:space:]]+= 127\.0\.0\.1)$/#\1/' /etc/mysql/mariadb.conf.d/50-server.cnf
|
||||||
service mysql start
|
service mariadb start
|
||||||
cat <<EOF | mysql
|
cat <<EOF | mysql
|
||||||
CREATE USER IF NOT EXISTS 'mysql' IDENTIFIED BY 'mysql';
|
CREATE USER IF NOT EXISTS 'mysql' IDENTIFIED BY 'mysql';
|
||||||
GRANT ALL PRIVILEGES ON *.* TO 'mysql' WITH GRANT OPTION;
|
GRANT ALL PRIVILEGES ON *.* TO 'mysql' WITH GRANT OPTION;
|
||||||
|
@ -21,7 +21,7 @@ EOF
|
||||||
|
|
||||||
# POSTGRESQL
|
# POSTGRESQL
|
||||||
service postgresql stop
|
service postgresql stop
|
||||||
POSTGRES_DIR=/etc/postgresql/11/main
|
POSTGRES_DIR=/etc/postgresql/*/main
|
||||||
cat <<EOF > $POSTGRES_DIR/pg_hba.conf
|
cat <<EOF > $POSTGRES_DIR/pg_hba.conf
|
||||||
# TYPE DATABASE USER ADDRESS METHOD
|
# TYPE DATABASE USER ADDRESS METHOD
|
||||||
local all postgres peer
|
local all postgres peer
|
||||||
|
|
|
@ -75,6 +75,7 @@ auth_setup() {
|
||||||
# LDAP
|
# LDAP
|
||||||
apt install -y --no-install-recommends libnss-ldapd
|
apt install -y --no-install-recommends libnss-ldapd
|
||||||
service nslcd stop || true
|
service nslcd stop || true
|
||||||
|
mkdir -p /etc/ldap
|
||||||
cp .drone/ldap.conf /etc/ldap/ldap.conf
|
cp .drone/ldap.conf /etc/ldap/ldap.conf
|
||||||
grep -Eq '^map group member uniqueMember$' /etc/nslcd.conf || \
|
grep -Eq '^map group member uniqueMember$' /etc/nslcd.conf || \
|
||||||
echo 'map group member uniqueMember' >> /etc/nslcd.conf
|
echo 'map group member uniqueMember' >> /etc/nslcd.conf
|
||||||
|
|
|
@ -16,7 +16,7 @@ Docker containers instead, which are much easier to work with than the VM.
|
||||||
|
|
||||||
First, make sure you create the virtualenv:
|
First, make sure you create the virtualenv:
|
||||||
```sh
|
```sh
|
||||||
docker run --rm -v "$PWD:$PWD:z" -w "$PWD" python:3.7-buster sh -c 'apt update && apt install -y libaugeas0 && python -m venv venv && . venv/bin/activate && pip install -r requirements.txt -r dev-requirements.txt'
|
docker run --rm -v "$PWD:$PWD:z" -w "$PWD" python:3.9-bullseye sh -c 'apt update && apt install -y libaugeas0 && python -m venv venv && . venv/bin/activate && pip install -r requirements.txt -r dev-requirements.txt'
|
||||||
```
|
```
|
||||||
Then bring up the containers:
|
Then bring up the containers:
|
||||||
```sh
|
```sh
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version: "3.6"
|
version: "3.6"
|
||||||
|
|
||||||
x-common: &common
|
x-common: &common
|
||||||
image: python:3.7-buster
|
image: python:3.9-bullseye
|
||||||
volumes:
|
volumes:
|
||||||
- .:$PWD:z
|
- .:$PWD:z
|
||||||
environment:
|
environment:
|
||||||
|
@ -14,7 +14,7 @@ x-common: &common
|
||||||
services:
|
services:
|
||||||
auth1:
|
auth1:
|
||||||
<<: *common
|
<<: *common
|
||||||
image: debian:buster
|
image: debian:bullseye
|
||||||
hostname: auth1
|
hostname: auth1
|
||||||
command: auth1
|
command: auth1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue