Page MenuHomePhorge
Files F85628914

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdee76a..802c1dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,37 @@
stages:
- prepare
- build
prepare-env:
stage: prepare
script: |
tag="$CI_COMMIT_BRANCH"
tag="$(echo "$tag" | sed -e "s/[^a-zA-Z0-9]/-/g")"
echo "tag=$tag" >> prepare.env
artifacts:
reports:
dotenv: prepare.env
-build-code:
+build-ubuntu-20.04:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script: |
mkdir -p /kaniko/.docker
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg JOBS=1 --destination $CI_REGISTRY_IMAGE/deps:$tag
+ /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg JOBS=1 --build-arg UBUNTU_VERSION=20.04 --destination $CI_REGISTRY_IMAGE/deps:$tag --destination $CI_REGISTRY_IMAGE/deps:$tag-ubuntu20.04
+ dependencies:
+ - prepare-env
+
+build-ubuntu-22.04:
+ stage: build
+ image:
+ name: gcr.io/kaniko-project/executor:debug
+ entrypoint: [""]
+ script: |
+ mkdir -p /kaniko/.docker
+ echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+ /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg JOBS=1 --build-arg UBUNTU_VERSION=22.04 --destination $CI_REGISTRY_IMAGE/deps:$tag-ubuntu22.04
dependencies:
- prepare-env
diff --git a/Dockerfile b/Dockerfile
index dad03e8..9656a8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,106 +1,107 @@
-FROM ubuntu:20.04
+ARG UBUNTU_VERSION=22.04
+FROM ubuntu:${UBUNTU_VERSION}
RUN apt-get update && \
apt-get -y upgrade && \
DEBIAN_FRONTEND="noninteractive" apt-get -y install build-essential \
libboost-dev wget cmake git libcurl4-openssl-dev libssl-dev \
pkg-config libmicrohttpd-dev automake \
autoconf libtool libtool-bin autotools-dev gcovr libboost-serialization-dev libcrypto++-dev \
- g++-9 doxygen graphviz libboost-regex-dev
+ g++ doxygen graphviz libboost-regex-dev
RUN mkdir /build
WORKDIR /build
ARG JOBS=3
ARG DEPS_INSTALL_DIR=/opt/libkazv-deps
RUN wget https://github.com/catchorg/Catch2/archive/v3.3.2.tar.gz -O catch2.tar.gz && \
tar -xf catch2.tar.gz && \
cd Catch2-* && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -DCATCH_ENABLE_WERROR=OFF -DBUILD_TESTING=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf Catch2-* catch2.tar.gz
RUN wget https://github.com/nlohmann/json/archive/v3.11.2.tar.gz -O json.tar.gz && \
tar -xf json.tar.gz && \
cd json-* && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -DJSON_MultipleHeaders=ON -DJSON_BuildTests=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf json-* json.tar.gz
RUN wget https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -O cereal.tar.gz && \
tar -xf cereal.tar.gz && \
cd cereal-* && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -DJUST_INSTALL_CEREAL=ON -DWITH_WERROR=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf cereal-* cereal.tar.gz
RUN git clone https://github.com/arximboldi/immer.git && \
cd immer && \
git checkout 5e9fe0b && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -Dimmer_BUILD_TESTS=OFF -Dimmer_BUILD_EXAMPLES=OFF -Dimmer_BUILD_DOCS=OFF -Dimmer_BUILD_EXTRAS=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf immer
RUN git clone https://github.com/arximboldi/zug.git && \
cd zug && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -Dzug_BUILD_TESTS=OFF -Dzug_BUILD_EXAMPLES=OFF -Dzug_BUILD_DOCS=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf zug
RUN git clone https://github.com/arximboldi/lager.git && \
cd lager && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -Dlager_BUILD_TESTS=OFF -Dlager_BUILD_EXAMPLES=OFF -Dlager_BUILD_DOCS=OFF && \
make -j$JOBS install && \
cd ../.. && \
rm -rf lager
RUN wget https://github.com/whoshuu/cpr/archive/refs/tags/1.10.4.tar.gz -O cpr.tar.gz && \
tar -xf cpr.tar.gz && \
cd cpr-* && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -DCPR_FORCE_USE_SYSTEM_CURL=ON -DCPR_FORCE_OPENSSL_BACKEND=ON -DCPR_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON && \
make -j$JOBS install && \
cd ../.. && \
rm -rf cpr-* cpr.tar.gz
#RUN git clone https://github.com/whoshuu/cpr.git && \
# cd cpr && \
# mkdir build && cd build && \
# cmake .. -DUSE_SYSTEM_CURL=ON -DBUILD_CPR_TESTS=OFF -DBUILD_SHARED_LIBS=ON && \
# make -j$JOBS install && \
# cd ../.. && \
# rm -rf cpr
RUN wget https://gitlab.matrix.org/matrix-org/olm/-/archive/3.2.16/olm-3.2.16.tar.gz -O olm.tar.gz && \
tar -xf olm.tar.gz && \
cd olm-* && \
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$DEPS_INSTALL_DIR" -DCMAKE_PREFIX_PATH="$DEPS_INSTALL_DIR" -DOLM_TESTS=OFF -DBUILD_SHARED_LIBS=ON && \
make -j$JOBS install && \
cd ../.. && \
rm -rf olm-* olm.tar.gz
RUN wget https://github.com/etr/libhttpserver/archive/0.18.2.tar.gz -O libhttpserver.tar.gz && \
tar -xf libhttpserver.tar.gz && \
cd libhttpserver-* && \
./bootstrap && \
mkdir build && cd build && \
../configure --prefix="$DEPS_INSTALL_DIR" && \
make -j$JOBS && \
make -j$JOBS install && \
cd ../.. && \
rm -rf libhttpserver-* libhttpserver.tar.gz

File Metadata

Mime Type
text/x-diff
Expires
Sat, Aug 8, 3:55 PM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1723664
Default Alt Text
(6 KB)

Event Timeline