From da44266a46c5efdd488ed99df2e0a864c28a7b88 Mon Sep 17 00:00:00 2001 From: TANG ZHIXIONG Date: Thu, 22 Jun 2023 21:27:22 +0800 Subject: [PATCH 1/2] remove superlint --- Dockerfile.superlinter | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Dockerfile.superlinter diff --git a/Dockerfile.superlinter b/Dockerfile.superlinter deleted file mode 100644 index 8b3e3e4..0000000 --- a/Dockerfile.superlinter +++ /dev/null @@ -1,4 +0,0 @@ -FROM github/super-linter:slim-v4 - -# https://github.com/github/super-linter/blob/main/docs/run-linter-locally.md -ENV RUN_LOCAL=true USE_FIND_ALGORITHM=true From 305664d3a3da4773cb01d9e51f4aea46d5af46a2 Mon Sep 17 00:00:00 2001 From: TANG ZHIXIONG Date: Fri, 30 Jun 2023 00:01:16 +0800 Subject: [PATCH 2/2] install sdl2 --- Dockerfile.linux | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.linux b/Dockerfile.linux index 97f4733..8724f14 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -50,6 +50,8 @@ RUN yum update -y && yum install -y epel-release cmake3 && \ cd /tmp && rm -rf * && \ rm -rf /var/cache/yum +RUN yum update -y && yum install -y SDL2-devel && rm -rf /var/cache/yum + ADD entry.sh /bin/entry.sh ENTRYPOINT ["/bin/entry.sh"] ADD _vimrc /root/.vimrc diff --git a/Makefile b/Makefile index 1253800..c9e9f9b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: @echo nothing special -DOCKER_TAG_LINUX := ghcr.io/cubao/build-env-manylinux2014-x64:v0.0.3 +DOCKER_TAG_LINUX := ghcr.io/cubao/build-env-manylinux2014-x64:v0.0.4 docker_build_linux: docker build -t $(DOCKER_TAG_LINUX) -f Dockerfile.linux . docker images dockcross/manylinux2014-x64 --format "{{.Repository}}:{{.Tag}} -> {{.Size}}"