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

Commit 45f87aa

Browse files
authored
Fix docker caching for Ubuntu package cache (#123)
1 parent 4a873a9 commit 45f87aa

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

omniscidb/docker/dev/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ RUN apt-get update && apt-get install -y \
1717
tar \
1818
vim \
1919
wget \
20-
ca-certificates \
2120
lsb-release \
21+
software-properties-common \
2222
--
2323

2424
# cmake
25-
RUN apt-get install -y \
25+
RUN apt-get update && apt-get install -y \
2626
libssl-dev \
2727
libcurl4-openssl-dev \
2828
--
@@ -43,12 +43,12 @@ RUN apt-get update && apt-get install -y \
4343
gcc-9 \
4444
g++-9 \
4545
openjdk-11-jdk \
46-
--
47-
ENV PATH=/usr/lib/llvm-12/bin${PATH:+:${PATH}}
46+
-- && \
47+
update-alternatives \
48+
--install /usr/bin/gcc gcc /usr/bin/gcc-9 800 \
49+
--slave /usr/bin/g++ g++ /usr/bin/g++-9
4850

49-
RUN update-alternatives \
50-
--install /usr/bin/gcc gcc /usr/bin/gcc-9 800 \
51-
--slave /usr/bin/g++ g++ /usr/bin/g++-9
51+
ENV PATH=/usr/lib/llvm-12/bin${PATH:+:${PATH}}
5252

5353
# Dependencies
5454
RUN apt-get update && apt-get install -y \

omniscidb/docker/dev/Dockerfile.l0

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Intel GPU stack
22
# https://dgpu-docs.intel.com/installation-guides/ubuntu/ubuntu-focal.html
3-
RUN apt-get install -y gpg-agent software-properties-common && \
4-
wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \
3+
RUN wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \
54
apt-add-repository \
65
'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' && \
76
apt-get update && \

0 commit comments

Comments
 (0)