Use external docker image: ayufan/rock64-dockerfiles:x86_64

Nislaco · Feb 11, 2018 · c6f4ac9 · c6f4ac9
1 parent d1131c6
commit c6f4ac9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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