Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Follow https://apt.kitware.com in Dockerfiles #266

Merged
merged 4 commits into from
Oct 6, 2021
Merged

Follow https://apt.kitware.com in Dockerfiles #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70b8d3f
Follow https://apt.kitware.com in Dockerfile-bionic
Oct 6, 2021
78e4d00
Fix xenial Dockerfile in the same way.
Oct 6, 2021
2d805ec
Build docker images for all pushes instead of for all PR creations.
Oct 6, 2021
b5ad066
Reformat Dockerfiles.
Oct 6, 2021
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
5 changes: 0 additions & 5 deletions .github/workflows/build_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ on:
# We ignore all tags, since paths filters don't work for tags events, and
# we use releases instead.
- "*"
branches:
- main
pull_request:
paths:
- "docker/Dockerfile*"
release:
types: [released]

Expand Down
12 changes: 9 additions & 3 deletions docker/Dockerfile-bionic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -yq \
bison \
build-essential \
ca-certificates \
cmake \
curl \
flex \
git \
gpg \
libbz2-dev \
ninja-build \
software-properties-common \
wget

WORKDIR /opt/conda_setup

RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add -
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
| gpg --dearmor - \
> /usr/share/keyrings/kitware-archive-keyring.gpg

RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
RUN apt-get update && apt-get --allow-unauthenticated install -yq \
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' \
> /etc/apt/sources.list.d/kitware.list

RUN apt-get update && apt-get install -yq \
cmake \
kitware-archive-keyring

Expand Down
10 changes: 6 additions & 4 deletions docker/Dockerfile-xenial
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -yq \
curl \
flex \
git \
gpg \
libbz2-dev \
ninja-build \
software-properties-common \
Expand All @@ -21,11 +22,12 @@ RUN apt-get update && apt-get install -yq \
WORKDIR /opt/conda_setup

RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
| gpg -dearmor - \
| tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
| gpg -dearmor - \
> /etc/apt/trusted.gpg.d/kitware.gpg

RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main'
RUN apt-get update && apt-get --allow-unauthenticated install -yq cmake
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ xenial main' \
> /etc/apt/sources.list.d/kitware.list
RUN apt-get update && apt-get install -yq cmake kitware-archive-keyring

RUN curl -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
chmod +x miniconda.sh && \
Expand Down