Skip to content

The Unified and Autonomous Development Platform

Move server build environment docker file to a separate project

Robin Shen1ca47ebc6740
diff --git a/server-product/build/build-server-build-environment.sh b/server-product/build/build-server-build-environment.sh
deleted file mode 100755
index 7b516cc785..0000000000
--- a/server-product/build/build-server-build-environment.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-version=1.0
-docker build -t 1dev/server-build-environment:$version -f docker/Dockerfile.server-build-environment .
-docker login -u robinshen -p $@
-docker push 1dev/server-build-environment:$version
diff --git a/server-product/build/build-server.sh b/server-product/build/build.sh
similarity index 88%
rename from server-product/build/build-server.sh
rename to server-product/build/build.sh
index 5e42b6f435..3138481072 100755
--- a/server-product/build/build-server.sh
+++ b/server-product/build/build.sh
@@ -8,7 +8,7 @@ cp docker/* ../target/docker
unzip ../target/onedev-${buildVersion}.zip -d ../target/docker
mv ../target/docker/onedev-${buildVersion} ../target/docker/onedev
cp ../target/sandbox/site/lib/mysql* ../target/sandbox/site/lib/postgresql* ../target/docker/onedev/site/lib
-docker build -t 1dev/server:${buildVersion} -f docker/Dockerfile.server ../target/docker
+docker build -t 1dev/server:${buildVersion} ../target/docker
docker login -u robinshen -p $@
docker push 1dev/server:${buildVersion}
diff --git a/server-product/build/docker/Dockerfile.server b/server-product/build/docker/Dockerfile
similarity index 100%
rename from server-product/build/docker/Dockerfile.server
rename to server-product/build/docker/Dockerfile
diff --git a/server-product/build/docker/Dockerfile.server-build-environment b/server-product/build/docker/Dockerfile.server-build-environment
deleted file mode 100644
index 0eab724381..0000000000
--- a/server-product/build/docker/Dockerfile.server-build-environment
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build the docker image with necessary tools to build onedev server docker image
-FROM docker:19.03.5-git
-RUN apk add openjdk8 maven