Skip to content

Commit 2da42cc

Browse files
committed
update containers with Debian Trixie as suggested in INSTALL.md
1 parent 5c37ac5 commit 2da42cc

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

deployment/linuxfr-board/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM docker.io/ruby:3-slim-bookworm
1+
FROM docker.io/ruby:3-slim-trixie
22

33
LABEL org.opencontainers.image.title="Board for LinuxFr.org"
44
LABEL org.opencontainers.image.description="Users of the LinuxFr.org website can chat on a space called the board (« la tribune » in french). \
55
This Ruby daemon notifies the users when something is said with Server-Sent Event / EventSource."
66
LABEL org.opencontainers.image.source="https://github.com/linuxfrorg/board-sse-linuxfr.org"
77
LABEL org.opencontainers.image.url="https://github.com/linuxfrorg/board-sse-linuxfr.org"
88
LABEL org.opencontainers.image.licenses="AGPL-3.0-only"
9-
LABEL org.opencontainers.image.version="ruby3-bookworm"
9+
LABEL org.opencontainers.image.version="1-ruby3-trixie"
1010
LABEL org.opencontainers.image.authors="Adrien Dorsaz <[email protected]>"
1111

1212
ARG UID=1200

deployment/linuxfr-img/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/debian:bookworm-slim as base
1+
FROM docker.io/debian:trixie-slim as base
22

33
FROM base as build
44

@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.description="Store external images into a cache t
77
LABEL org.opencontainers.image.source="https://github.com/linuxfrorg/img-LinuxFr.org"
88
LABEL org.opencontainers.image.url="https://github.com/linuxfrorg/linuxfr.org/blob/master/Container.md"
99
LABEL org.opencontainers.image.licenses="AGPL-3.0-only"
10-
LABEL org.opencontainers.image.version="bookworm"
10+
LABEL org.opencontainers.image.version="main-trixie"
1111
LABEL org.opencontainers.image.authors="Adrien Dorsaz <[email protected]>"
1212

1313
ARG UID=1200

deployment/linuxfr.org/Containerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM docker.io/debian:bookworm-slim
1+
FROM docker.io/debian:trixie-slim
22

33
LABEL org.opencontainers.image.title="LinuxFr.org website"
44
LABEL org.opencontainers.image.description="Run LinuxFr.org Ruby on Rails website"
55
LABEL org.opencontainers.image.source="https://github.com/linuxfrorg/linuxfr.org"
66
LABEL org.opencontainers.image.url="https://github.com/linuxfrorg/linuxfr.org/blob/master/Container.md"
77
LABEL org.opencontainers.image.licenses="AGPL-3.0-only"
8-
LABEL org.opencontainers.image.version="rails7-bookworm"
8+
LABEL org.opencontainers.image.version="rails8-trixie"
99
LABEL org.opencontainers.image.authors="Adrien Dorsaz <[email protected]>"
1010

1111
ARG UID=1200
@@ -16,13 +16,12 @@ RUN \
1616
IFS=$'\n\t'; \
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends --allow-downgrades \
19-
mariadb-client libmariadb++-dev git \
20-
build-essential openssl libreadline-dev curl libcurl4-openssl-dev zlib1g \
21-
zlib1g-dev libssl-dev libxml2-dev libxslt-dev autoconf libgmp-dev libyaml-dev \
22-
ncurses-dev bison automake libtool imagemagick libc6-dev hunspell \
23-
hunspell-fr-comprehensive ruby ruby-dev ruby-rack \
24-
nodejs; \
25-
gem install bundler -v 2.4.20; \
19+
default-mysql-server default-libmysqlclient-dev \
20+
libmysql++-dev git build-essential openssl libreadline-dev curl \
21+
libcurl4-openssl-dev zlib1g zlib1g-dev libssl-dev libxml2-dev libxslt-dev \
22+
autoconf libgmp-dev libyaml-dev ncurses-dev bison automake libtool \
23+
imagemagick libc6-dev hunspell hunspell-fr-comprehensive redis-server \
24+
ruby ruby-bundler ruby-dev; \
2625
apt-get clean
2726

2827
USER ${UID}

0 commit comments

Comments
 (0)