Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kiwicom/dockerfiles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4455d566519479e1e0dae47f08fa9318a54fc241
Choose a base ref
..
head repository: kiwicom/dockerfiles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccb516a6c1f178a8468141d807f18d167754b2e0
Choose a head ref
Showing with 11 additions and 9 deletions.
  1. +1 −1 nginx-301-https/Dockerfile
  2. +8 −7 pre-commit/Dockerfile
  3. +2 −1 tox/Dockerfile
2 changes: 1 addition & 1 deletion nginx-301-https/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.23.3-alpine
FROM nginx:1.23.4-alpine

COPY default.conf /etc/nginx/conf.d/default.conf

15 changes: 8 additions & 7 deletions pre-commit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM python:3.10-slim
FROM python:3.11-slim

ENV PATH="$PATH:/root/.pyenv/bin:/root/.pyenv/shims"
ENV version=2.17.0
ENV version=3.0.4

RUN apt update && \
apt install -y git golang bash curl build-essential libffi-dev libssl-dev libbz2-dev libncursesw5-dev libgdbm-dev liblzma-dev libsqlite3-dev tk-dev uuid-dev libreadline-dev nodejs npm python3-distutils zlib1g-dev && \
curl --location https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash && \
pyenv update && \
pyenv install 3.7.12 && \
pyenv install 3.8.12 && \
pyenv install 3.9.10 && \
pyenv install 3.10.2 && \
pyenv global 3.10.2 3.9.10 3.8.12 3.7.12 && \
pyenv install 3.7.16 && \
pyenv install 3.8.16 && \
pyenv install 3.9.16 && \
pyenv install 3.10.10 && \
pyenv install 3.11.2 && \
pyenv global 3.11.2 3.10.10 3.9.16 3.8.16 3.7.16 && \
pyenv rehash && \
npm config set unsafe-perm true && \
pip install pre-commit==$version && \
3 changes: 2 additions & 1 deletion tox/Dockerfile
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ RUN apk add --no-cache --virtual=.build-deps bzip2-dev cargo curl git linux-head
pyenv install 3.8.7 && \
pyenv install 3.9.1 && \
pyenv install 3.10.4 && \
pyenv global 3.10.4 3.9.1 3.8.7 3.7.9 3.6.12 3.5.10 && \
pyenv install 3.11.2 && \
pyenv global 3.11.2 3.10.4 3.9.1 3.8.7 3.7.9 3.6.12 3.5.10 && \
pyenv rehash && \
pip install tox==$version && \
apk del .build-deps && \