Skip to content

Commit

Permalink
remove debian stretch, add debian bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
vilhelmprytz committed Jan 6, 2024
1 parent e466a8b commit 2834841
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 30 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ jobs:
tags: wilfreddev/alpine:latest
platforms: linux/amd64,linux/arm64/v8

# Debian stretch
- name: Build and push wilfreddev/debian:stretch
uses: docker/build-push-action@v2
with:
context: docker-images/debian-stretch
push: true
tags: wilfreddev/debian:stretch

# Debian bullseye
- name: Build and push wilfreddev/debian:bullseye
uses: docker/build-push-action@v2
Expand All @@ -45,6 +37,14 @@ jobs:
push: true
tags: wilfreddev/debian:bullseye

# Debian bookworm
- name: Build and push wilfreddev/debian:bookworm
uses: docker/build-push-action@v2
with:
context: docker-images/debian-bookworm
push: true
tags: wilfreddev/debian:bookworm

# Java 8
- name: Build and push wilfreddev/java:8
uses: docker/build-push-action@v2
Expand Down
16 changes: 16 additions & 0 deletions docker-images/debian-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM debian:bookworm-slim

LABEL author="Vilhelm Prytz" maintainer="[email protected]"

ENV DEBAIN_FRONTEND noninteractive
ENV HOME /server

RUN apt update && apt upgrade -y

RUN apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 libfontconfig libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4

RUN update-locale lang=en_US.UTF-8 && dpkg-reconfigure --frontend noninteractive locales

RUN set -x && apt-get update && apt-get upgrade -y && dpkg --add-architecture i386 && apt-get update && apt-get install -y lib32z1 && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* && useradd -d /server container

WORKDIR ${HOME}
19 changes: 0 additions & 19 deletions docker-images/debian-stretch/Dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions images/other/multi-theft-auto.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"uid": "multi-theft-auto",
"name": "Multi Theft Auto",
"author": "[email protected]",
"docker_image": "wilfreddev/debian:stretch",
"docker_image": "wilfreddev/debian:bookworm",
"command": "./mta-server64",
"default_port": "22003",
"user": "container",
Expand All @@ -15,7 +15,7 @@
"files": []
},
"installation": {
"docker_image": "wilfreddev/debian:stretch",
"docker_image": "wilfreddev/debian:bookworm",
"shell": "/bin/bash",
"script": [
"apt update -y",
Expand All @@ -31,4 +31,4 @@
]
},
"variables": []
}
}

0 comments on commit 2834841

Please sign in to comment.