forked from e2guardian/e2guardian
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v5.4' of github.com:e2guardian/e2guardian into v5.4
- Loading branch information
Showing
16 changed files
with
195 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| build:raspbian: | ||
| build:arm: | ||
| stage: build | ||
| image: amd64/debian:stable | ||
| image: debian:bullseye | ||
| artifacts: | ||
| expire_in: 30 minutes | ||
| paths: | ||
|
|
@@ -12,31 +12,28 @@ build:raspbian: | |
| - echo $VFULL | ||
| - apt update | ||
| - apt-get -y upgrade | ||
| - apt install --no-install-recommends --no-install-suggests -y curl unzip base-files automake base-passwd pkg-config bash coreutils debianutils diffutils dpkg e2fsprogs findutils grep gzip hostname ncurses-base tar git bsdutils lsb-release | ||
| - echo "deb-src http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list | ||
| - dpkg --add-architecture armhf | ||
| - apt-get update | ||
| - apt-get install -y build-essential crossbuild-essential-armhf | ||
| - apt-get build-dep -y -a armhf e2guardian | ||
| - echo "deb-src http://deb.debian.org/debian bullseye main contrib non-free" >> /etc/apt/sources.list | ||
| - apt-get install --no-upgrade --no-install-recommends --no-install-suggests -y curl unzip automake coreutils debianutils diffutils e2fsprogs findutils grep unzip ncurses-base libevent-pthreads-* libevent-dev ncurses-bin login sysvinit-utils tar libc6-dev libc-dev gcc g++ make dpkg-dev autotools-dev debhelper dh-autoreconf dpatch libclamav-dev libpcre3-dev zlib1g-dev pkg-config libssl-dev libssl1.1 ca-certificates lsb-release inotify-tools curl | ||
| - cd $CI_PROJECT_DIR && make clean | ||
| - ./autogen.sh | ||
| - ./configure --host=arm-linux-gnueabihf --prefix=/usr --enable-clamd=yes --with-proxyuser=e2guardian --with-proxygroup=e2guardian --sysconfdir=/etc --localstatedir=/var --enable-icap=yes --enable-commandline=yes --enable-email=yes --enable-ntlm=yes --enable-pcre=yes --enable-sslmitm=yes | ||
| - make ARCH=arm-linux-gnueabihf | ||
| - file src/e2guardian | grep "ARM, EABI5" | ||
| - make | ||
| - find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" + | ||
| tags: | ||
| - arm | ||
|
|
||
| package:raspbian: | ||
| package:debarm: | ||
| stage: create-package | ||
| image: amd64/debian:stable | ||
| image: debian:bullseye | ||
| dependencies: | ||
| - build:raspbian | ||
| - build:arm | ||
| artifacts: | ||
| paths: | ||
| - $CI_PROJECT_DIR | ||
| variables: | ||
| PACKPATH: "$CI_PROJECT_DIR" | ||
| PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2raspbian_package" | ||
| OS: "raspbian" | ||
| PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2debian-arm64_package" | ||
| OS: "debian-arm64" | ||
| script: | ||
| - source $CI_PROJECT_DIR/scripts/debian_package/variables | ||
| - apt update | ||
|
|
@@ -56,6 +53,42 @@ package:raspbian: | |
| - find ${PACKDST}/ -type f -name "Makefil*" -delete | ||
| - find ${PACKDST}/ -type f -name "*.in" -delete | ||
| - cd ${PACKDST} && cd .. && ./rebuild.sh e2"$OS"_package | ||
| - find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" + | ||
| tags: | ||
| - arm | ||
|
|
||
| test:debianarm: | ||
| stage: test-publish | ||
| image: debian:bullseye | ||
| dependencies: | ||
| - package:debarm | ||
| artifacts: | ||
| name: builddebian | ||
| paths: | ||
| - $CI_PROJECT_DIR | ||
| variables: | ||
| PACKPATH: "$CI_PROJECT_DIR" | ||
| PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2debian-arm64_package" | ||
| CERT_DIR: "/etc/e2guardian/private/" | ||
| OS: "debian-arm64" | ||
| script: | ||
| - source $CI_PROJECT_DIR/scripts/debian_package/variables | ||
| - echo $VFULL | ||
| - apt update | ||
| - apt install -y openssl curl git lsb-release libevent-pthreads* libtommath* | ||
| - VERSION=`lsb_release -cs` | ||
| - cd ${PACKDST} && cd .. && dpkg -i e2"$OS"_package.deb | ||
| - sed -i "s/^#sslmitm.*$/sslmitm\ =\ on/" /etc/e2guardian/e2guardianf1.conf && sed -i "s/^#enablessl.*$/enablessl\ =\ on/" /etc/e2guardian/e2guardian.conf && sed -i "s/^RANDFILE\s*=\s*\\\$ENV/#RANDFILE\ =\ \$ENV/" /etc/ssl/openssl.cnf | ||
| - mkdir -p ${CERT_DIR}generatedcerts | ||
| - openssl genrsa 4096 > "${CERT_DIR}ca.key" && openssl req -subj "/C=US" -new -x509 -days 3650 -key "${CERT_DIR}ca.key" -out "${CERT_DIR}ca.pem" && openssl genrsa 4096 > "${CERT_DIR}cert.key" | ||
| - chown --recursive e2guardian:e2guardian ${CERT_DIR} | ||
| - echo "qwant.com" >> /etc/e2guardian/lists/example.group/bannedsitelist | ||
| - e2guardian -N & | ||
| - sleep 5 && export https_proxy=http://localhost:8080 | ||
| - curl -k -o /tmp/test https://www.google.com | ||
| - curl -k https://www.qwant.com | grep -i e2guardian | ||
| - unset https_proxy | ||
| - mkdir -p "${CI_COMMIT_BRANCH}" | ||
| - mv e2"$OS"_package.deb ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb | ||
| - md5sum ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb > ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d)_md5.txt | ||
| - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' | ||
|
|
@@ -65,3 +98,5 @@ package:raspbian: | |
| - ssh-add <(echo "$SSH_NOSTROMO_KEY") | ||
| - scp -P 822 -r ${CI_COMMIT_BRANCH} [email protected]:/datas/e2/html | ||
| - find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" + | ||
| tags: | ||
| - arm | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,29 @@ | ||
| FROM debian:buster | ||
|
|
||
| LABEL commit.e2guardian=$COMMIT build_date.e2guardian=$BUILD_DATE | ||
| FROM debian:bullseye-slim as buildamd | ||
| COPY . /tmp/e2guardian | ||
| RUN cd /tmp/e2guardian \ | ||
| && apt-get update && apt-get install --no-install-recommends --no-install-suggests -y sed libevent-pthreads-* libssl1.1 ca-certificates \ | ||
| WORKDIR /tmp/e2guardian | ||
|
|
||
| FROM debian:bullseye-slim | ||
| WORKDIR /tmp/e2guardian | ||
| ENV DOCKER_BUILD=/tmp/e2guardian/scripts/debian_package/e2debian_package/data | ||
| COPY --from=buildamd --chown=1161 /tmp/e2guardian/src/e2guardian /usr/sbin/e2guardian | ||
| COPY --from=buildamd --chown=1161 $DOCKER_BUILD/etc/e2guardian /etc/e2guardian | ||
| COPY --from=buildamd --chown=1161 $DOCKER_BUILD/usr/share/e2guardian/languages /usr/share/e2guardian/languages | ||
| COPY --from=buildamd --chown=1161 $DOCKER_BUILD/usr/share/e2guardian/*swf /usr/share/e2guardian/ | ||
| COPY --from=buildamd --chown=1161 $DOCKER_BUILD/usr/share/e2guardian/*gif /usr/share/e2guardian/ | ||
| RUN apt-get update && apt-get install --no-upgrade --no-install-recommends --no-install-suggests -y sed libevent-pthreads-* libssl1.1 ca-certificates curl \ | ||
| && adduser --no-create-home --uid 1161 --group --system e2guardian \ | ||
| && cp src/e2guardian /usr/sbin/e2guardian \ | ||
| && chmod +x /usr/sbin/e2guardian \ | ||
| && cp -Rf configs /etc/e2guardian \ | ||
| && mkdir -p /usr/share/e2guardian/languages \ | ||
| && mkdir -p /run/e2guardian \ | ||
| && mkdir -p /var/log/e2guardian && chown -R e2guardian /var/log/e2guardian && chown -R e2guardian /etc/e2guardian && chown -R e2guardian /run/e2guardian \ | ||
| && cp -Rf data/languages /usr/share/e2guardian/ \ | ||
| && cp data/*.gif /usr/share/e2guardian/ \ | ||
| && cp data/*swf /usr/share/e2guardian/ \ | ||
| && mkdir -p /var/log/e2guardian && chown -R e2guardian /var/log/e2guardian && chown -R e2guardian /run/e2guardian \ | ||
| && rm -Rf /tmp/* \ | ||
| && sed -i "s/^#dockermode.*$/dockermode\ =\ on/" /etc/e2guardian/e2guardian.conf \ | ||
| && sed -i "s/^#pidfilename.*$/pidfilename\ =\ \/run\/e2guardian\/e2.pid/" /etc/e2guardian/e2guardian.conf \ | ||
| && sed -i "s/^#icapport.*$/icapport\ =\ 1344/" /etc/e2guardian/e2guardian.conf \ | ||
| && apt-get autoremove -y \ | ||
| && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* | ||
| && apt-get clean \ | ||
| && rm -Rf /var/lib/apt/lists/* | ||
|
|
||
| COPY --chown=e2guardian:root run.sh / | ||
| RUN chmod +x /run.sh | ||
| HEALTHCHECK CMD curl localhost:8080 || exit 1 | ||
| HEALTHCHECK CMD curl --proxy "http://127.0.0.1:8080" http://internal.test.e2guardian.org | grep "e2guardian internal test OK" || exit 1 | ||
| USER e2guardian | ||
| EXPOSE 8080 | ||
| ENTRYPOINT ["/run.sh"] | ||
| #Shell will take up PID 1, and e2guardian will be its child proces | ||
| CMD ["/bin/sh", "-c","e2guardian", "-N"] |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| docker-hub-build-arm: | ||
| stage: Docker-hub-build | ||
| image: docker:dind | ||
| dependencies: | ||
| - package:debarm | ||
| variables: | ||
| DOCKER_DST: "/tmp/e2guardian/scripts/debian_package/e2debian_package" | ||
| tags: | ||
| - arm | ||
| before_script: | ||
| - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY | ||
| script: | ||
| - cd $CI_PROJECT_DIR && cp gitlabci/docker-ci/Dockerfile ./Dockerfile | ||
| - docker build --build-arg E2_VERSION="$CI_COMMIT_BRANCH" --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM . | ||
| - docker push $CONTAINER_BUILD_NOPROD_NAME_ARM | ||
|
|
||
| variables: | ||
| CONTAINER_PROD_IMAGE_ARM: $HUB_REGISTRY_IMAGE:$CI_COMMIT_BRANCH-arm | ||
| CONTAINER_BUILD_NOPROD_NAME_ARM: $HUB_REGISTRY_IMAGE:build-noprod-arm | ||
|
|
||
| docker-hub-test-arm: | ||
| image: $CONTAINER_BUILD_NOPROD_NAME_ARM | ||
| stage: Docker-hub-test | ||
| dependencies: [] | ||
| script: | ||
| - e2guardian -N & | ||
| - sleep 5 && export https_proxy=http://localhost:8080 && curl -k https://www.google.fr | ||
| tags: | ||
| - arm | ||
|
|
||
| dive-arm: | ||
| image: | ||
| name: wagoodman/dive:latest | ||
| entrypoint: [""] | ||
| dependencies: [] | ||
| stage: Docker-hub-test | ||
| script: | ||
| - docker pull $CONTAINER_BUILD_NOPROD_NAME_ARM | ||
| - dive $CONTAINER_BUILD_NOPROD_NAME_ARM | ||
| variables: | ||
| CI: "true" | ||
|
|
||
| push-docker-hub-arm: | ||
| stage: Docker-hub-pushtag | ||
| image: docker:dind | ||
| dependencies: [] | ||
| before_script: | ||
| - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY | ||
| script: | ||
| - docker pull $CONTAINER_BUILD_NOPROD_NAME_ARM | ||
| - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $CONTAINER_PROD_IMAGE_ARM | ||
| - docker push $CONTAINER_PROD_IMAGE_ARM | ||
| tags: | ||
| - arm |
Oops, something went wrong.