Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dockerfiles/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ARG base_image=alpine:latest

FROM ${base_image} AS resource

RUN apk update && apk upgrade
RUN apk --no-cache add \
bash \
curl \
Expand Down
12 changes: 6 additions & 6 deletions dockerfiles/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ ARG base_image

FROM ${base_image} AS resource

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN apt update && apt upgrade -y
RUN apt install -y --no-install-recommends \
curl \
gnupg \
gzip \
Expand All @@ -17,12 +17,12 @@ RUN apt-get update \
software-properties-common

RUN apt-add-repository ppa:git-core/ppa \
&& apt-get update \
&& apt-get install -y git \
&& apt update \
&& apt install -y git \
&& rm -rf /var/lib/apt/lists/*

RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get install -y git-lfs
RUN apt install -y git-lfs

WORKDIR /root
RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
Expand Down Expand Up @@ -193,7 +193,7 @@ ADD test/ /tests
RUN /tests/all.sh

FROM resource AS integrationtests
RUN apt-get update && apt-get install -y squid
RUN apt update && apt install -y squid
ADD test/ /tests/test
ADD integration-tests /tests/integration-tests
RUN /tests/integration-tests/integration.sh
Expand Down