From c6c607a406388b67f03ac17e3cbb96801a8c2378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Wed, 2 Oct 2024 19:13:00 +0200 Subject: [PATCH] improve make docker-shell --- Makefile | 4 ++-- system/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3ef5169ff..7d373df40 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ docker-image: ## Build aptly-dev docker image docker-build: ## Build aptly in docker container @docker run -it --rm -v ${PWD}:/work/src aptly-dev /work/src/system/run-aptly-cmd make build -docker-aptly: ## Build and run aptly commands in docker container +docker-shell: ## Run aptly and other commands in docker container @docker run -it --rm -v ${PWD}:/work/src aptly-dev /work/src/system/run-aptly-cmd docker-deb: ## Build debian packages in docker container @@ -222,4 +222,4 @@ clean: ## remove local build and module cache test -d .go/ && chmod u+w -R .go/ && rm -rf .go/ || true rm -rf build/ docs/ obj-*-linux-gnu* -.PHONY: help man prepare version binaries docker-release docker-system-tests docker-unit-tests docker-lint docker-build docker-image build docker-aptly clean releasetype dpkg dev-server docker-dev-server +.PHONY: help man prepare version binaries docker-release docker-system-tests docker-unit-tests docker-lint docker-build docker-image build docker-shell clean releasetype dpkg dev-server docker-dev-server diff --git a/system/Dockerfile b/system/Dockerfile index 22bdb6ff4..7663fd8b6 100644 --- a/system/Dockerfile +++ b/system/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg a apt-get clean && rm -rf /var/lib/apt/lists/* RUN useradd -m --shell /bin/sh --home-dir /var/lib/aptly aptly +RUN sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /var/lib/aptly/.bashrc RUN mkdir /work WORKDIR /work