From f3219e947707aeef9ca5cf9b9844e45f4fcb36a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Mon, 18 Nov 2024 23:33:28 +0100 Subject: [PATCH] merge changes from workstation "Mustafa": - add ubuntu libraries - remove unused Makefile --- Dockerfile.ubuntu | 10 ++++++++++ Makefile | 28 ---------------------------- 2 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 Makefile diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 518b064..5b2f55f 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -27,6 +27,16 @@ FROM stage-base AS stage-diagrams RUN set -ex; \ \ apt-get update; apt-get install -y \ + libasound2t64 \ + libatk1.0-0t64 \ + libatk-bridge2.0-0t64 \ + libgbm1 \ + libnss3 \ + libxcomposite1 \ + libxdamage1 \ + libxfixes3 \ + libxkbcommon0 \ + libxrandr2 \ npm \ ; rm -rf /var/lib/apt/lists/*; \ \ diff --git a/Makefile b/Makefile deleted file mode 100644 index de98246..0000000 --- a/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -image_tag = ldericher/autodoc -docker_build = docker build -docker_run = docker run --rm -it -examples_flags = -v "$(shell pwd)/examples:/docs" -u "$(shell id -u):$(shell id -g)" - -.PHONY: default -default: - $(info use other targets: image build watch shell clean) - -.PHONY: image -image: - $(docker_build) --tag $(image_tag) ./ - -.PHONY: build -build: image - $(docker_run) $(examples_flags) $(image_tag) -b - -.PHONY: watch -watch: image - $(docker_run) $(examples_flags) $(image_tag) - -.PHONY: shell -shell: image - $(docker_run) $(examples_flags) --entrypoint ash $(image_tag) - -.PHONY: clean -clean: - git clean -xdf ./examples \ No newline at end of file