diff --git a/Jenkinsfile b/Jenkinsfile index e6a3dc2..d92847f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ node('docker && linux-build') { stage('Environment') { checkout scm - def environment = docker.build('build-environment:build-rock64-image', 'environment') + def environment = docker.image('ayufan/rock64-dockerfiles:x86_64') environment.inside("--privileged -u 0:0") { withEnv([ diff --git a/Makefile.dev.mk b/Makefile.dev.mk index a02a69a..0f3e34f 100644 --- a/Makefile.dev.mk +++ b/Makefile.dev.mk @@ -27,8 +27,6 @@ pull-trees: .PHONY: shell # run docker shell to build image shell: - @echo Building environment... - @docker build -q -t rock64-linux:build-environment environment/ @echo Entering shell... @docker run --rm \ -it \ @@ -44,4 +42,4 @@ shell: -h rock64-build-env \ -v $(CURDIR):$(CURDIR) \ -w $(CURDIR) \ - rock64-linux:build-environment + ayufan/rock64-dockerfiles:x86_64 diff --git a/README.md b/README.md index 62d9800..4ef18c1 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,6 @@ You can easily compile everything stored in this repository by ensuring that you ```bash $ make shell - Building environment... - sha256:0aa8a81c687f58bc9b46e33ea6b5f01188c85874ceb729767dfe882b2783abd2 Entering shell... ayufan@rock64-build-env:~/Sources/linux-build$ make sync repo init -u https://github.com/ayufan-rock64/linux-manifests -b default --depth=1 --no-clone-bundle diff --git a/environment/Dockerfile b/environment/Dockerfile deleted file mode 100644 index 71990c6..0000000 --- a/environment/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM ubuntu:bionic - -RUN apt-get update -y && \ - apt-get install -y python git-core gnupg flex bison gperf build-essential \ - zip curl zlib1g-dev libc6-dev-i386 \ - lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z-dev ccache \ - libgl1-mesa-dev libxml2-utils xsltproc unzip mtools u-boot-tools \ - htop iotop sysstat iftop pigz bc device-tree-compiler lunzip \ - dosfstools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \ - gcc-arm-linux-gnueabi g++-arm-linux-gnueabi ccache \ - sudo cpio nano vim kmod kpartx wget bsdtar qemu-user-static \ - pxz ruby-dev debootstrap multistrap libssl-dev parted \ - live-build linaro-image-tools jq locales \ - gawk swig libpython-dev libusb-1.0-0-dev \ - pkg-config autoconf - -RUN locale-gen en_US.UTF-8 - -ENV LANG=en_US.UTF-8 \ - LANGUAGE=en_US:en \ - LC_ALL=en_US.UTF-8 \ - USER=root \ - HOME=/root - -RUN git config --global user.email "you@rock64" && \ - git config --global user.name "ROCK64 Shell" - -RUN gem install fpm - -RUN curl -L https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 | tar -C /tmp -jx && \ - mv /tmp/bin/linux/amd64/github-release /usr/local/bin/ - -RUN which github-release -RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \ - chmod +x /usr/local/bin/repo - -RUN git clone https://github.com/rockchip-linux/rkflashtool && \ - make -C rkflashtool install && \ - rm -rf rkflashtool - -RUN git clone https://github.com/rockchip-linux/rkdeveloptool && \ - cd rkdeveloptool && \ - autoreconf -i && \ - ./configure && \ - make install && \ - cd .. && \ - rm -rf rkdeveloptool - -RUN ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ -ENV LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib:$LD_LIBRARY_PATH - -# Enable passwordless sudo for users under the "sudo" group -RUN sed -i -e \ - 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \ - /etc/sudoers \ No newline at end of file