Lock down git dependencies

This commit is contained in:
Pedro Pombeiro 2019-01-09 14:59:39 +01:00
parent e8de37f5ef
commit 04f6782f1d
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
5 changed files with 27 additions and 5 deletions

View File

@ -1,6 +1,8 @@
FROM ubuntu:16.04 AS qt_build FROM ubuntu:16.04 AS qt_build
ARG QT_VERSION ARG QT_VERSION
ARG REACT_NATIVE_DESKTOP_COMMIT_SHA
ARG QT_CI_COMMIT_SHA
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git libx11-xcb1 libxss1 libasound2 libfontconfig1 libdbus-1-3 && \ git libx11-xcb1 libxss1 libasound2 libfontconfig1 libdbus-1-3 && \
@ -14,8 +16,13 @@ ENV QT_CI_PACKAGES qt.qt5.5112.gcc_64,qt.qt5.5112.qtwebengine.gcc_64
# We run this as part of a separate container to reduce number of stages. # We run this as part of a separate container to reduce number of stages.
# We also remove some of the static-linked binaries since they are so big. # We also remove some of the static-linked binaries since they are so big.
# Crucial ones: qmake,rcc,moc,uic,qdbuscpp2xml,qdbusxml2cpp,lrelease,lupdate,lconvert # Crucial ones: qmake,rcc,moc,uic,qdbuscpp2xml,qdbusxml2cpp,lrelease,lupdate,lconvert
# NOTE: Unfortunately GitHub doesn't support cloning a specific SHA1, so we need to
# resort to git fetch (https://stackoverflow.com/questions/3489173/how-to-clone-git-repository-with-specific-revision-changeset)
ADD qt-opensource-linux-x64-${QT_VERSION}.run /tmp/ ADD qt-opensource-linux-x64-${QT_VERSION}.run /tmp/
RUN git clone --depth=1 https://github.com/benlau/qtci.git /tmp/qtci && \ RUN mkdir -p /tmp/qtci && cd /tmp/qtci && \
git init && git remote add origin https://github.com/benlau/qtci.git && \
git fetch --depth=1 origin ${QT_CI_COMMIT_SHA} && \
git reset --hard FETCH_HEAD && \
/tmp/qtci/bin/extract-qt-installer --disable-progress-report \ /tmp/qtci/bin/extract-qt-installer --disable-progress-report \
/tmp/qt-opensource-linux-x64-${QT_VERSION}.run /opt/qt-all && \ /tmp/qt-opensource-linux-x64-${QT_VERSION}.run /opt/qt-all && \
find /opt/qt-all/${QT_VERSION}/gcc_64/bin -type f -regextype posix-egrep -regex \ find /opt/qt-all/${QT_VERSION}/gcc_64/bin -type f -regextype posix-egrep -regex \
@ -65,8 +72,10 @@ RUN cd /tmp && wget -q https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.t
RUN curl -sL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -o /usr/bin/lein && \ RUN curl -sL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -o /usr/bin/lein && \
chmod +x /usr/bin/lein && /usr/bin/lein version chmod +x /usr/bin/lein && /usr/bin/lein version
RUN cd /tmp && \ RUN mkdir -p /tmp/react-native-desktop && cd /tmp/react-native-desktop && \
git clone --depth=1 https://github.com/status-im/react-native-desktop.git && \ git init && git remote add origin https://github.com/status-im/react-native-desktop.git && \
git fetch --depth=1 origin ${REACT_NATIVE_DESKTOP_COMMIT_SHA} && \
git reset --hard FETCH_HEAD && \
cp -r /tmp/react-native-desktop/react-native-cli /opt && \ cp -r /tmp/react-native-desktop/react-native-cli /opt && \
cd /opt/react-native-cli && \ cd /opt/react-native-cli && \
npm update && npm install -g && \ npm update && npm install -g && \

View File

@ -6,6 +6,8 @@ QT_VER_MJR = 5.11
QT_ARCHIVE = qt-opensource-linux-x64-$(QT_VERSION).run QT_ARCHIVE = qt-opensource-linux-x64-$(QT_VERSION).run
QT_MD5SUM = 974fda61267cfb6e45984ee5f0a285f8 QT_MD5SUM = 974fda61267cfb6e45984ee5f0a285f8
QT_URL = https://download.qt.io/archive/qt QT_URL = https://download.qt.io/archive/qt
QT_CI_COMMIT_SHA = 55ffd9f225708b3aa1443851cfa8dead2c1f9959
REACT_NATIVE_DESKTOP_COMMIT_SHA = 2a76c435a27f0bf6c089f74222212b3a58e10385
# WARNING: Remember to change the tag when updating the image # WARNING: Remember to change the tag when updating the image
IMAGE_TAG = 1.1.1 IMAGE_TAG = 1.1.1
@ -14,6 +16,8 @@ IMAGE_NAME = statusteam/linux-desktop-ubuntu:$(IMAGE_TAG)
build: $(QT_ARCHIVE) build: $(QT_ARCHIVE)
docker build \ docker build \
--build-arg="QT_VERSION=$(QT_VERSION)" \ --build-arg="QT_VERSION=$(QT_VERSION)" \
--build-arg="QT_CI_COMMIT_SHA=$(QT_CI_COMMIT_SHA)" \
--build-arg="REACT_NATIVE_DESKTOP_COMMIT_SHA=$(REACT_NATIVE_DESKTOP_COMMIT_SHA)" \
--label="commit=$(GIT_COMMIT)" \ --label="commit=$(GIT_COMMIT)" \
-t $(IMAGE_NAME) . -t $(IMAGE_NAME) .

View File

@ -1,5 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
ARG REACT_NATIVE_DESKTOP_COMMIT_SHA
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ENV LANGUAGE en_US.UTF-8 ENV LANGUAGE en_US.UTF-8
@ -37,8 +39,10 @@ RUN cd /tmp && wget -q https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.t
RUN curl -sL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -o /usr/bin/lein && \ RUN curl -sL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -o /usr/bin/lein && \
chmod +x /usr/bin/lein && /usr/bin/lein version chmod +x /usr/bin/lein && /usr/bin/lein version
RUN cd /tmp && \ RUN mkdir -p /tmp/react-native-desktop && cd /tmp/react-native-desktop && \
git clone --depth=1 https://github.com/status-im/react-native-desktop.git && \ git init && git remote add origin https://github.com/status-im/react-native-desktop.git && \
git fetch --depth=1 origin ${REACT_NATIVE_DESKTOP_COMMIT_SHA} && \
git reset --hard FETCH_HEAD && \
cp -r /tmp/react-native-desktop/react-native-cli /opt && \ cp -r /tmp/react-native-desktop/react-native-cli /opt && \
cd /opt/react-native-cli && \ cd /opt/react-native-cli && \
npm update && npm install -g && \ npm update && npm install -g && \

View File

@ -4,8 +4,11 @@ GIT_COMMIT = $(shell git rev-parse --short HEAD)
IMAGE_TAG = 1.1.1 IMAGE_TAG = 1.1.1
IMAGE_NAME = statusteam/windows-desktop-ubuntu:$(IMAGE_TAG) IMAGE_NAME = statusteam/windows-desktop-ubuntu:$(IMAGE_TAG)
REACT_NATIVE_DESKTOP_COMMIT_SHA = 2a76c435a27f0bf6c089f74222212b3a58e10385
build: build:
docker build \ docker build \
--build-arg="REACT_NATIVE_DESKTOP_COMMIT_SHA=$(REACT_NATIVE_DESKTOP_COMMIT_SHA)" \
--label="commit=$(GIT_COMMIT)" \ --label="commit=$(GIT_COMMIT)" \
-t $(IMAGE_NAME) . -t $(IMAGE_NAME) .

View File

@ -68,6 +68,8 @@ endif()
ExternalProject_Add(SnoreNotify_ep ExternalProject_Add(SnoreNotify_ep
GIT_REPOSITORY https://github.com/status-im/snorenotify.git GIT_REPOSITORY https://github.com/status-im/snorenotify.git
GIT_TAG 9d54904e4896ab6c3c3a52f97381e5948b455970
GIT_SHALLOW TRUE
CMAKE_ARGS ${SnoreNotify_CMAKE_ARGS} CMAKE_ARGS ${SnoreNotify_CMAKE_ARGS}
BUILD_BYPRODUCTS ${SnoreNotify_STATIC_LIB} ${SnoreNotify_LIBS} ${SnoreNotifyBackend_STATIC_LIB} BUILD_BYPRODUCTS ${SnoreNotify_STATIC_LIB} ${SnoreNotify_LIBS} ${SnoreNotifyBackend_STATIC_LIB}
${SnoreNotifyBackendSettings_STATIC_LIB} ${SnoreNotifySettings_STATIC_LIB} ${SnoreNotifyBackendSettings_STATIC_LIB} ${SnoreNotifySettings_STATIC_LIB}