Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy docker images on bookworm #464

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye AS scz-base
FROM debian:bookworm AS scz-base
LABEL org.opencontainers.image.authors="SRAM team <[email protected]>"

ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -25,7 +25,7 @@ RUN apt-get update -y && \
locales-all \
logrotate \
net-tools \
netcat \
netcat-openbsd \
nullmailer \
openssh-server \
parted \
Expand All @@ -39,18 +39,22 @@ RUN apt-get update -y && \
vim \
wget \
xz-utils && \
apt-get purge -y isc-dhcp-client && \
apt-get purge -y \
isc-dhcp-client \
systemd-timesyncd && \
apt-get clean -y && \
apt-get autoremove --purge -y && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /tmp/* /var/tmp/*

RUN update-locale

RUN systemctl enable ssh.service && \
systemctl disable systemd-timesyncd.service && \
echo "exit 0" > /usr/sbin/policy-rc.d

RUN systemctl disable getty@ && \
systemctl disable getty.target && \
rm /lib/systemd/system/multi-user.target.wants/getty.target && \
rm /lib/systemd/system/getty.target.wants/getty-static.service

RUN useradd --create-home --shell /bin/bash --groups adm ansible && \
install -d -o ansible -m 0700 /home/ansible/.ssh && \
echo -n 'ansible:ansible' | chpasswd
Expand Down
4 changes: 2 additions & 2 deletions provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
tasks:
- { import_tasks: "tasks/versions.yml", tags: ['common'] }
roles:
- { role: pyff-metadata, tags: ['meta','pyff-metadata']}
- { role: metadata, tags: ['meta','metadata'] }
# - { role: pyff-metadata, tags: ['meta','pyff-metadata']}
# - { role: metadata, tags: ['meta','metadata'] }

- name: "client"
hosts: client
Expand Down
2 changes: 1 addition & 1 deletion roles/apt/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
debian_dist: 'bullseye'
debian_dist: 'bookworm'

deb_host: >-
{% if is_aws | default(false) -%}
Expand Down
2 changes: 1 addition & 1 deletion roles/apt/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
- "lsof"
- "needrestart"
- "net-tools"
- "netcat"
- "netcat-openbsd"
- "parted"
- "python3"
- "python3-apt"
Expand Down
6 changes: 0 additions & 6 deletions roles/db_server/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@
=mCOI
-----END PGP PUBLIC KEY BLOCK-----

- name: Install mariadb repo
apt_repository:
filename: "mariadb"
repo: "deb https://mirror.rackspace.com/mariadb/repo/10.5/debian bullseye main"
update_cache: true

- name: Create mariadb.service.d directory
file:
path: /etc/systemd/system/mariadb.service.d
Expand Down
7 changes: 0 additions & 7 deletions roles/lb_haproxy/files/haproxy-log-bindmount.conf

This file was deleted.

1 change: 0 additions & 1 deletion roles/lb_haproxy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
src: "{{item}}"
dest: "/etc/systemd/system/haproxy.service.d/"
with_items:
- "haproxy-log-bindmount.conf"
- "haproxy-state.conf"
notify:
- "systemd daemon-reload"
Expand Down
2 changes: 1 addition & 1 deletion roles/simplesamlphp/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: "restart php-fpm"
listen: "restart php-fpm"
systemd:
name: "php7.4-fpm.service"
name: "php8.2-fpm.service"
state: "restarted"
daemon_reload: true
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion roles/simplesamlphp/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
- name: Install fpm pool config
template:
src: "fpm-pool.j2"
dest: "/etc/php/7.4/fpm/pool.d/{{simplesaml_name}}.conf"
dest: "/etc/php/8.2/fpm/pool.d/{{simplesaml_name}}.conf"
notify: "restart php-fpm"

- name: Find php version
Expand Down