From 16be784a6456e3809560582c522ac1f8f84df0d4 Mon Sep 17 00:00:00 2001 From: YannK Date: Wed, 10 Jul 2024 18:04:00 +0200 Subject: [PATCH] Cleaning steps --- .forgejo/workflows/generate_docker_image.yml | 6 +----- godot4/Dockerfile | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.forgejo/workflows/generate_docker_image.yml b/.forgejo/workflows/generate_docker_image.yml index cd0d34b..441d8c5 100644 --- a/.forgejo/workflows/generate_docker_image.yml +++ b/.forgejo/workflows/generate_docker_image.yml @@ -4,11 +4,7 @@ jobs: name: Compilation of Docker image for Godot runs-on: bookworm container: docker - steps: - - name: Add NodeJs & Git - run: | - uname -a - apk add nodejs npm git + steps: - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/godot4/Dockerfile b/godot4/Dockerfile index 2833d2d..b7d014c 100644 --- a/godot4/Dockerfile +++ b/godot4/Dockerfile @@ -28,11 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libxrandr-dev \ && rm -rf /var/lib/apt/lists/* -<<<<<<< HEAD -ENV GODOT_VERSION="4.2.2-stable" -======= ENV GODOT_VERSION="4.0.2-stable" ->>>>>>> d821de56600d8b8fc651f35d6369976482f5fc1a RUN wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip \ && wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_export_templates.tpz \