Bump docker image Ubuntu version to 22.04
Remove -k option, that doesn't exist for cmake.
This commit is contained in:
parent
c9e052fe58
commit
df1416db1f
3 changed files with 7 additions and 7 deletions
|
@ -60,7 +60,7 @@ if [[ "$OS" == 'Linux' ]]; then
|
|||
if [[ ${LCOV:-0} == 1 ]]; then
|
||||
cmake --build ${PWD} --target generate_coverage -- -j2
|
||||
else
|
||||
cmake --build ${PWD} --target ${build_target} -k -- -j2
|
||||
cmake --build ${PWD} --target ${build_target} -- -j2
|
||||
fi
|
||||
else
|
||||
sudo cmake --build ${PWD} --target ${build_target} -- -j2
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.04
|
||||
FROM ubuntu:22.04
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
@ -6,13 +6,16 @@ RUN apt-get update -qq && apt-get install -yqq \
|
|||
build-essential \
|
||||
g++ \
|
||||
wget \
|
||||
python \
|
||||
python3 \
|
||||
zlib1g-dev \
|
||||
cmake \
|
||||
git
|
||||
|
||||
RUN apt-get update -qq && apt-get install -yqq \
|
||||
qt5-default \
|
||||
qtbase5-dev \
|
||||
qtchooser \
|
||||
qt5-qmake \
|
||||
qtbase5-dev-tools \
|
||||
valgrind \
|
||||
xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
|
||||
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
ARG ENV_REPOSITORY=nanocurrency/nano-env
|
||||
FROM ${ENV_REPOSITORY}:base
|
||||
|
||||
RUN apt-get update -qq && apt-get install -yqq \
|
||||
..
|
||||
|
||||
ARG REPOSITORY=nanocurrency/nano-node
|
||||
LABEL org.opencontainers.image.source https://github.com/$REPOSITORY
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue