Skip to content

The Unified and Autonomous Development Platform

Remove duplicate docker folder

Robin Shenf39d3c382e1d
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index ffa8d7ee7d..0000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build the docker image for onedev server
-FROM ubuntu:18.04
-COPY app /app
-COPY entrypoint.sh idle.sh /root/bin/
-COPY kubectl /usr/local/bin/
-RUN apt-get update && apt-get install -y docker.io iproute2 curl git openjdk-8-jre-headless
-EXPOSE 6610
-CMD ["/root/bin/entrypoint.sh"]
diff --git a/docker/build.sh b/docker/build.sh
deleted file mode 100755
index d20b9df92f..0000000000
--- a/docker/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cd ../..
-
-echo "Detecting project version (may require some time while downloading maven dependencies)..."
-buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
-
-mvn clean package
-
-cp -r server-product/docker docker
-cp server-product/target/onedev-${buildVersion}.zip .
-unzip onedev-${buildVersion}.zip -d docker
-mv docker/onedev-${buildVersion} docker/app
-cp server-product/target/sandbox/site/lib/mysql* server-product/target/sandbox/site/lib/postgresql* docker/app/site/lib
-
-docker build -t 1dev/server:${buildVersion} docker
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index da34359ba2..0000000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-_sigterm() {
- kill -TERM "$child"
- wait "$child"
- exit 1
-}
-_sigint() {
- wait "$child"
- exit 1
-}
-
-trap _sigterm SIGTERM
-trap _sigint SIGINT
-
-/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf wrapper.pidfile=/app/status/onedev_upgrade.pid -- upgrade /opt/onedev &
-child=$!
-wait "$child"
-
-touch /opt/onedev/IN_DOCKER
-/opt/onedev/boot/wrapper-linux-x86-64 /opt/onedev/conf/wrapper.conf &
-child=$!
-wait "$child"
diff --git a/docker/idle.sh b/docker/idle.sh
deleted file mode 100755
index 7710d334f1..0000000000
--- a/docker/idle.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-_sighandler() {
- kill -TERM "$child"
- wait "$child"
- exit 0
-}
-
-trap _sighandler SIGINT SIGTERM
-
-while [ true ]; do
- sleep 60 &
- child=$!
- wait "$child"
-done
diff --git a/docker/kubectl b/docker/kubectl
deleted file mode 100755
index fbdba4a181..0000000000
Binary files a/docker/kubectl and /dev/null differ