diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-02-25 21:38:01 +0100 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-02-25 21:38:01 +0100 |
| commit | 3bd571855591fd067b4e3647e81751c88d5464c9 (patch) | |
| tree | e6bf7f6cc8e61c1d1c69e273656fd664b9ea76b3 | |
| parent | docker: add run.sh (diff) | |
| download | cgitize-3bd571855591fd067b4e3647e81751c88d5464c9.tar.gz cgitize-3bd571855591fd067b4e3647e81751c88d5464c9.zip | |
add --quiet flags to all installations
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/frontend/Dockerfile | 8 | ||||
| -rw-r--r-- | test/integration/docker/git_server/Dockerfile | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62b205c..51fd8f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: git config --global user.name 'John Doe' git config --global user.email 'John.Doe@example.com' - name: Install dependencies - run: pip install -e . + run: pip install -q -e . - name: Integration test (local) run: ./test/integration/local/test.sh - name: Unit tests @@ -68,7 +68,7 @@ jobs: python-version: '3.10' cache: pip - name: Install dependencies - run: pip install -r requirements.txt + run: pip install -q -r requirements.txt - name: Set up ssh-agent uses: webfactory/ssh-agent@v0.7.0 with: @@ -143,9 +143,9 @@ jobs: with: python-version: '3.10' - name: Verify package can be installed - run: pip install . + run: pip install -q . - name: Install package builder - run: pip install --upgrade build + run: pip install -q --upgrade build - name: Build package run: python -m build - name: Publish as artifact @@ -119,14 +119,14 @@ venv/reset: .PHONY: venv venv: venv/reset - . '$(call escape,$(venv_dir))/bin/activate' && pip install -r requirements.txt + . '$(call escape,$(venv_dir))/bin/activate' && pip install -q -r requirements.txt # Is there a better way? .PHONY: venv/upgrade venv/upgrade: venv/reset . '$(call escape,$(venv_dir))/bin/activate' \ - && pip install . \ - && pip uninstall --yes "$$( python setup.py --name )" \ + && pip install -q . \ + && pip uninstall -q --yes "$$( python setup.py --name )" \ && pip freeze > requirements.txt .PHONY: py diff --git a/docker/Dockerfile b/docker/Dockerfile index b751ca7..f745ca6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,16 +2,16 @@ FROM alpine:3.17 AS base FROM base AS build -RUN apk add --no-cache gcc libffi-dev make musl-dev python3-dev py3-pip +RUN apk add -q --no-cache gcc libffi-dev make musl-dev python3-dev py3-pip COPY ["requirements.txt", "/tmp/"] -RUN pip3 install --no-cache-dir --target=/deps -r /tmp/requirements.txt +RUN pip3 install -q --no-cache-dir --target=/deps -r /tmp/requirements.txt FROM base LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>" -RUN apk add --no-cache bash git openssh-client python3 tini +RUN apk add -q --no-cache bash git openssh-client python3 tini COPY --from=build ["/deps", "/deps/"] ENV PYTHONPATH="/deps:/usr/src" diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 7254115..42c1ea9 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -6,7 +6,7 @@ FROM base AS builder ARG CMARK_GFM_VERSION=0.29.0.gfm.6 ADD ["https://github.com/github/cmark-gfm/archive/refs/tags/$CMARK_GFM_VERSION.zip", "/"] -RUN apk add --no-cache cmake g++ make python3 && \ +RUN apk add -q --no-cache cmake g++ make python3 && \ ln -sf /usr/bin/python3 /usr/bin/python RUN unzip -- "$CMARK_GFM_VERSION.zip" && \ cd -- "cmark-gfm-$CMARK_GFM_VERSION" && \ @@ -17,12 +17,12 @@ RUN unzip -- "$CMARK_GFM_VERSION.zip" && \ # Install the latest Pygments (so that it would highlight CMakeLists.txt, etc.): ARG PYGMENTS_VERSION=~=2.0 -RUN apk add --no-cache py3-pip && \ - pip3 install --no-cache-dir --target=/pygments "pygments$PYGMENTS_VERSION" +RUN apk add -q --no-cache py3-pip && \ + pip3 install -q --no-cache-dir --target=/pygments "pygments$PYGMENTS_VERSION" FROM base -RUN apk add --no-cache cgit dash fcgiwrap python3 spawn-fcgi tini && \ +RUN apk add -q --no-cache cgit dash fcgiwrap python3 spawn-fcgi tini && \ # Replace the theme with the one I like better: grep -q -F -- "style='pastie'" /usr/lib/cgit/filters/syntax-highlighting.py && \ sed -i -e "s/style='pastie'/style='vs'/" -- /usr/lib/cgit/filters/syntax-highlighting.py diff --git a/test/integration/docker/git_server/Dockerfile b/test/integration/docker/git_server/Dockerfile index c07e108..f45de02 100644 --- a/test/integration/docker/git_server/Dockerfile +++ b/test/integration/docker/git_server/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -RUN apk --no-cache add bash git openssh-server tini && \ +RUN apk add -q --no-cache bash git openssh-server tini && \ echo 'root:root' | chpasswd && \ git config --global user.name 'John Doe' && \ git config --global user.email 'John.Doe@example.com' && \ |