Browse Source

Merge branch 'build-image/master'

build-image/master
Claudio Luck 7 months ago
parent
commit
f497da59e5
3 changed files with 44 additions and 16 deletions
  1. +2
    -0
      .drone.yml
  2. +8
    -6
      GNUmakefile
  3. +34
    -10
      parts/build/Dockerfile

+ 2
- 0
.drone.yml View File

@ -65,6 +65,8 @@ steps:
- export _ver=${DRONE_TAG#Release_}
- export _ver=$${_ver:-$${_ver_mk}}
- export _pEp4Tb_rel=$$(git --git-dir .git/modules/contrib/pEp/pEpForThunderbird describe --tags)
- "cp -f /install/bin/pEp-mini-json-adapter-local plat/lnx/pEp-mini-json-adapter-local 2>/dev/null || true"
- "cp -f /install/bin/pEp-mini-json-adapter plat/lnx/pEp-mini-json-adapter 2>/dev/null || true"
- make OS=lnx VARIANT=unreleased pEp4Tb_release="$${_pEp4Tb_rel}" VERSION="$${_ver}" download-parts
- "[ ! -e plat/lnx/tb_setup ] || touch plat/lnx/tb_setup"
- "[ -e plat/lnx/tb_setup ] || make -C src all wx_config=/usr/bin/wx-config"


+ 8
- 6
GNUmakefile View File

@ -4,7 +4,7 @@ space := ${null} ${null}
# You may override these variables in a CI or custom build:
#
VERSION := 2.1.0-RC.1
VERSION := 2.2.0-RC.1
VERSION_XYZ := $(firstword $(subst -, ,$(VERSION)))
VERSION_XY := $(subst $(space),.,$(wordlist 1,2,$(subst ., ,$(VERSION_XYZ))))
#
@ -234,11 +234,13 @@ webstart:
download-parts:
ls -l /install/* || true
curl -L $(PARTS_HOST)/parts/pepmda-tb-linux+$(PEPMDA_VER)-x86_64.zip > contrib/pepmda.zip
mkdir -p build/pepmda
unzip -d build/pepmda contrib/pepmda.zip
cp -fH build/pepmda/share/pEp/system.db parts/system.db
cp -fH build/pepmda/bin/pEp-mini-json-adapter plat/lnx/pEp-mini-json-adapter
cp -fH build/pepmda/bin/pEp-mini-json-adapter.user plat/lnx/pEp-mini-json-adapter.user
if [ ! -e plat/lnx/pEp-mini-json-adapter ] ; then \
mkdir -p build/pepmda && \
unzip -d build/pepmda contrib/pepmda.zip && \
cp -fH build/pepmda/share/pEp/system.db parts/system.db && \
cp -fH build/pepmda/bin/pEp-mini-json-adapter plat/lnx/pEp-mini-json-adapter && \
cp -fH build/pepmda/bin/pEp-mini-json-adapter.user plat/lnx/pEp-mini-json-adapter.user ; \
fi
curl -L $(PARTS_HOST)/parts/Python27-static.tgz > contrib/Python27-static.tgz
tar -C plat/lnx/ -xf contrib/Python27-static.tgz
curl -L $(PARTS_HOST)/parts/pEp4Tb@pEp.security.xpi > plat/lnx/pEp4Tb@pEp.security.xpi


+ 34
- 10
parts/build/Dockerfile View File

@ -19,26 +19,50 @@ RUN echo http://ftp.halifax.rwth-aachen.de/alpine//edge/main >/etc/apk/
# Following https://pep-security.lu/gitlab/marcel/peplinuxbuilder#installer:
RUN mkdir -p /scripts
RUN mkdir -p /scripts /scripts/patches
COPY contrib/pEp/pEpLinuxBuilder/*.sh /scripts/
COPY contrib/pEp/pEpLinuxBuilder/patches /scripts/
COPY contrib/pEp/pEpLinuxBuilder/patches/*.patch /scripts/patches/
RUN chown -R build: /scripts
WORKDIR /scripts
RUN ( sed -i.bak -e 's/adduser build//g' ./alpine-installdeps-gui.sh || true ) \
&& ( sed -i.bak -e 's/boost1.75-static//g' ./alpine-installdeps-gui.sh || true ) \
&& ( sed -i.bak -e 's/capnproto-dev//g' ./alpine-installdeps-gui.sh || true )
RUN ( sed -i.bak -e 's/adduser build//g' ./alpine-installdeps-gui.sh || true )
RUN ./alpine-installdeps-gui.sh \
&& apk add zip
#
USER build
WORKDIR /scripts
# #RUN abuild-keygen -a -i -n
# # RUN git config --global user.name "Build Bot"
# # RUN git config --global user.email "build@pep.oneon.ch"
# # WORKDIR /home/build/src/pEpLinuxBuilder
ENV RUST_BACKTRACE full
RUN sed -i.bak -e 's/make -j8/make -j26/g' ./*.sh
RUN sed -i.bak -e 's#^YML2_PROC=.*$#YML2_PROC=/install/yml2/yml2proc -E utf-8#g' ./pEp-engine.sh ./pEp-engine-local.sh
RUN sed -i.bak -e 's/^PEPENGINE_VERSION=.*$/PEPENGINE_VERSION=Release_2.1.23/' ./settings.sh
RUN sed -i.bak -e 's/^JSONADAPTER_VERSION=.*$/JSONADAPTER_VERSION=Release_2.1.0-RC19/' ./settings.sh
RUN sed -i.bak -e 's/^PEPADAPTER_VERSION=.*$/PEPADAPTER_VERSION=Release_2.1.17/' ./settings.sh
# Actually fail on error
RUN echo 'set -e' >>./settings.sh
RUN ./deps-iconv-static.sh
RUN ./tools-asn1c.sh
RUN ./tools-yml2.sh
RUN ./pEp-etpan.sh
RUN ./pEp-webserver.sh
RUN ./pEp-sequoia.sh
# System-install
RUN ./pEp-engine.sh
RUN ./pEp-adapter.sh
RUN ./pEp-jsonadapter.sh
RUN mv /install/bin/pEp-mini-json-adapter /install/bin/pEp-mini-json-adapter-local
# User-install
RUN rm -rf /build/pEpEngine/ /build/libpEpAdapter/ /build/pEpJSONServerAdapter/
RUN ./pEp-engine-local.sh
RUN ./pEp-adapter.sh
RUN ./pEp-jsonadapter.sh
RUN ./deps-cairo-static.sh
RUN ./deps-pango-static.sh
RUN ./tools-wxwidgets.sh


Loading…
Cancel
Save