Skip to content

Commit

Permalink
Switch docker images (#4155)
Browse files Browse the repository at this point in the history
* Switch docker images

8.0-jammy-chiseled is a little too slim for ace as currently built and executed

* Update docker-compose.yml

* Update docker-compose.arm64
  • Loading branch information
LtRipley36706 authored Apr 24, 2024
1 parent 97ee3cb commit 76dc0ab
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ COPY . ../.
RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace --no-restore

# final stage/image
FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled
FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy
ARG DEBIAN_FRONTEND="noninteractive"
WORKDIR /ace

# install net-tools (netstat for health check) & cleanup
RUN apt-get update && \
apt-get install --no-install-recommends -y \
RUN apt update && \
apt install --no-install-recommends -y \
net-tools && \
apt-get clean && \
apt clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ COPY . ../.
RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace -r linux-arm64 --self-contained false --no-restore

# final stage/image
FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled
FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy
ARG DEBIAN_FRONTEND="noninteractive"
WORKDIR /ace

# install net-tools (netstat for health check) & cleanup
RUN apt-get update && \
apt-get install --no-install-recommends -y \
RUN apt update && \
apt install --no-install-recommends -y \
net-tools && \
apt-get clean && \
apt clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.arm64
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
version: '3'
#version: '3'
services:

ace-db:
#image: linuxserver/mariadb:latest
image: mysql/mysql-server:latest
#image: mysql/mysql-server:latest
image: mysql:8.0
container_name: ace-db
env_file:
- docker.env
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3'
#version: '3'
services:

ace-db:
image: mysql:latest
image: mysql:8.0
container_name: ace-db
env_file:
- docker.env
Expand Down

0 comments on commit 76dc0ab

Please sign in to comment.