Compare commits

..

8 Commits

Author SHA1 Message Date
dany
81877a64ae disable installing RUST
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2023-03-20 18:49:12 +01:00
dany
b9ce3925cd Update 'Dockerfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2023-01-26 21:42:27 +01:00
dany
ebc5c037fa Update 'Dockerfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2023-01-26 21:31:27 +01:00
dany
9220365d38 Update 'Dockerfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2023-01-26 21:00:01 +01:00
dany
1e3824a683 Update 'Dockerfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2023-01-26 20:49:05 +01:00
dany
00ec7f4366 Update 'Dockerfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2022-09-30 11:47:47 +02:00
dany
9b65bc22be Update 'Dockerfile'
Some checks reported errors
gitea-sync/ci-image/pipeline/head Something is wrong with the build of this commit
2022-09-30 11:42:42 +02:00
dany
c376cb82e8 Update 'Jenkinsfile'
All checks were successful
gitea-sync/ci-image/pipeline/head This commit looks good
2022-09-30 11:42:24 +02:00
2 changed files with 20 additions and 37 deletions

View File

@ -1,6 +1,7 @@
FROM debian:bookworm AS deploy-env FROM ubuntu:bionic AS build-env
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" \
RUN apt-get update && apt-get --yes --no-install-recommends install \ apt-get --yes --no-install-recommends install \
wget curl\
build-essential \ build-essential \
make \ make \
libsqlite3-dev \ libsqlite3-dev \
@ -11,39 +12,13 @@ RUN apt-get update && apt-get --yes --no-install-recommends install \
autotools-dev \ autotools-dev \
autoconf \ autoconf \
libtool \ libtool \
curl \
automake \ automake \
libffi-dev \ libffi-dev \
ca-certificates \ ca-certificates \
unzip \ unzip \
libjpeg62-turbo-dev \ libjpeg-turbo8-dev \
libvncserver-dev \ libvncserver-dev \
lua5.3 lua5.3 \
ENV RUSTUP_HOME=/opt/rust/rustup tree
ENV CARGO_HOME=/opt/rust/cargo # RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
# RUN chmod -R 777 /opt/rust/
RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
RUN . /opt/rust/cargo/env && rustup default stable
RUN chmod -R 777 /opt/rust/
RUN apt-get update && apt-get --yes --no-install-recommends install \
nodejs npm git wget libfuse2 fuse3
# cross build support
RUN dpkg --add-architecture armhf
RUN dpkg --add-architecture arm64
RUN apt-get update && apt-get --yes --no-install-recommends install \
crossbuild-essential-armhf \
crossbuild-essential-arm64 \
libsqlite3-dev:arm64 zlib1g-dev:arm64 libreadline-dev:arm64 libssl-dev:arm64 \
libffi-dev:arm64 libjpeg62-turbo-dev:arm64 libvncclient1:arm64 \
libsqlite3-dev:armhf zlib1g-dev:armhf libreadline-dev:armhf libssl-dev:armhf \
libffi-dev:armhf libjpeg62-turbo-dev:armhf libvncclient1:armhf
RUN ln -sf /usr/lib/arm-linux-gnueabihf/libvncclient.so.1 /usr/lib/arm-linux-gnueabihf/libvncclient.so
RUN ln -sf /usr/lib/aarch64-linux-gnu/libvncclient.so.1 /usr/lib/aarch64-linux-gnu/libvncclient.so
#RUN ln -sf /usr/lib/arm-linux-gnueabihf/libjpeg.so.62 /usr/lib/arm-linux-gnueabihf/libjpeg.so
#RUN ln -sf /usr/lib/aarch64-linux-gnu/libjpeg.so.62 /usr/lib/aarch64-linux-gnu/libjpeg.so
RUN groupadd -g 1000 -o ci
RUN useradd -m -u 1000 -g 1000 -o -s /bin/bash ci
USER ci
WORKDIR /home/ci

14
Jenkinsfile vendored
View File

@ -24,10 +24,18 @@ pipeline{
set -e set -e
set -x set -x
cd $WORKSPACE cd $WORKSPACE
docker buildx build \ # docker rmi -f $(docker images -f "dangling=true" -q)
--platform amd64 \ docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
--output "type=docker,push=false,name=xsangle/ci-tools:latest" \ for arch in arm arm64 amd64; do
echo "build for architecture $arch"
arch_name="${arch////-}"
docker buildx build \
--platform $arch \
--output "type=docker,push=false,name=xsangle/ci-tools:bionic-$arch_name" \
. .
# docker tag xsangle/ci-tools:bionic-$arch_name workstation:5000/xsangle/ci-tools:bionic-$arch_name
# docker push workstation:5000/xsangle/ci-tools:bionic-$arch_name
done
''' '''
} }
} }