From 9bb79020038d0bc249ca48d59e0a65ed3e9d3c1b Mon Sep 17 00:00:00 2001 From: wang yan Date: Fri, 31 Aug 2018 15:00:29 +0800 Subject: [PATCH] Deprecate dockerfiles in make/dev Signed-off-by: wang yan --- make/dev/adminserver/Dockerfile | 14 --- make/dev/docker-compose.yml | 146 -------------------------------- make/dev/jobservice/Dockerfile | 12 --- make/dev/registryctl/Dockerfile | 12 --- make/dev/ui/Dockerfile | 23 ----- 5 files changed, 207 deletions(-) delete mode 100644 make/dev/adminserver/Dockerfile delete mode 100644 make/dev/docker-compose.yml delete mode 100644 make/dev/jobservice/Dockerfile delete mode 100644 make/dev/registryctl/Dockerfile delete mode 100644 make/dev/ui/Dockerfile diff --git a/make/dev/adminserver/Dockerfile b/make/dev/adminserver/Dockerfile deleted file mode 100644 index 20238f8a3..000000000 --- a/make/dev/adminserver/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM golang:1.9.2 - -MAINTAINER yinw@vmware.com - -COPY . /go/src/github.com/goharbor/harbor - -WORKDIR /go/src/github.com/goharbor/harbor/src/adminserver - -RUN go build -a -o /go/bin/harbor_adminserver \ - && chmod u+x /go/bin/harbor_adminserver - -COPY ./make/migrations /go/bin/migrations -WORKDIR /go/bin/ -ENTRYPOINT ["/go/bin/harbor_adminserver"] diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml deleted file mode 100644 index b7bb7e145..000000000 --- a/make/dev/docker-compose.yml +++ /dev/null @@ -1,146 +0,0 @@ -version: '2' -services: - log: - build: - context: ../../ - dockerfile: make/photon/log/Dockerfile - container_name: harbor-log - env_file: - - ../common/config/log/env - restart: always - volumes: - - /var/log/harbor/:/var/log/docker/:z - ports: - - 127.0.0.1:1514:514 - networks: - - harbor - registry: - image: vmware/registry:2.6.1-photon - container_name: registry - restart: always - volumes: - - /data/registry:/storage:z - - ./common/config/registry/:/etc/registry/:z - networks: - - harbor - environment: - - GODEBUG=netdns=cgo - command: - ["serve", "/etc/registry/config.yml"] - depends_on: - - log - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "registry" - mysql: - build: ../common/db/ - container_name: harbor-db - restart: always - volumes: - - /data/database:/var/lib/mysql:z - networks: - - harbor - env_file: - - ../common/config/db/env - depends_on: - - log - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "mysql" - adminserver: - build: - context: ../../ - dockerfile: make/dev/adminserver/Dockerfile - container_name: harbor-adminserver - env_file: - - ../common/config/adminserver/env - restart: always - volumes: - - /data/config/:/etc/adminserver/config/:z - - /data/secretkey:/etc/adminserver/key:z - - /data/:/data/:z - depends_on: - - log - networks: - - harbor - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "adminserver" - ui: - build: - context: ../../ - dockerfile: make/dev/ui/Dockerfile - container_name: harbor-ui - env_file: - - ../common/config/ui/env - restart: always - volumes: - - ./common/config/ui/app.conf:/etc/ui/app.conf:z - - ./common/config/ui/private_key.pem:/etc/ui/private_key.pem:z - - /data/secretkey:/etc/ui/key:z - - /data/ca_download/:/etc/ui/ca/:z - - /data/psc/:/etc/ui/token/:z - networks: - - harbor - depends_on: - - log - - adminserver - - registry - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "ui" - jobservice: - build: - context: ../../ - dockerfile: make/dev/jobservice/Dockerfile - container_name: harbor-jobservice - env_file: - - ../common/config/jobservice/env - restart: always - volumes: - - /data/job_logs:/var/log/jobs:z - - ./common/config/jobservice/app.conf:/etc/jobservice/app.conf:z - - /data/secretkey:/etc/jobservice/key:z - networks: - - harbor - depends_on: - - ui - - adminserver - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "jobservice" - proxy: - image: vmware/nginx:1.11.5-patched - container_name: nginx - restart: always - volumes: - - ./common/config/nginx:/etc/nginx:z - networks: - - harbor - ports: - - 80:80 - - 443:443 - - 4443:4443 - depends_on: - - mysql - - registry - - ui - - log - logging: - driver: "syslog" - options: - syslog-address: "tcp://127.0.0.1:1514" - tag: "proxy" -networks: - harbor: - external: false diff --git a/make/dev/jobservice/Dockerfile b/make/dev/jobservice/Dockerfile deleted file mode 100644 index 62b8a8c8c..000000000 --- a/make/dev/jobservice/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.9.2 - -MAINTAINER jiangd@vmware.com - -COPY . /go/src/github.com/goharbor/harbor - -WORKDIR /go/src/github.com/goharbor/harbor/src/jobservice - -RUN go build -a -o /go/bin/harbor_jobservice \ - && chmod u+x /go/bin/harbor_jobservice -WORKDIR /go/bin/ -ENTRYPOINT ["/go/bin/harbor_jobservice"] diff --git a/make/dev/registryctl/Dockerfile b/make/dev/registryctl/Dockerfile deleted file mode 100644 index 69875a9b7..000000000 --- a/make/dev/registryctl/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.9.2 - -MAINTAINER wangyan@vmware.com - -COPY . /go/src/github.com/goharbor/harbor - -WORKDIR /go/src/github.com/goharbor/harbor/src/registryctl - -RUN go build -a -o /go/bin/harbor_registryctl \ - && chmod u+x /go/bin/harbor_registryctl -WORKDIR /go/bin/ -ENTRYPOINT ["/go/bin/harbor_registryctl"] diff --git a/make/dev/ui/Dockerfile b/make/dev/ui/Dockerfile deleted file mode 100644 index 42ee5ec41..000000000 --- a/make/dev/ui/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM golang:1.9.2 - -MAINTAINER jiangd@vmware.com - -COPY src/. /go/src/github.com/goharbor/harbor/src -WORKDIR /go/src/github.com/goharbor/harbor/src/ui - -RUN go build -a -o /go/bin/harbor_ui - -COPY src/ui/views /go/bin/views -COPY src/ui/static /go/bin/static -COPY src/favicon.ico /go/bin/favicon.ico - -RUN mkdir /go/bin/harbor/ -COPY VERSION /go/bin/harbor/UIVERSION - -RUN chmod u+x /go/bin/harbor_ui - -WORKDIR /go/bin/ -ENTRYPOINT ["/go/bin/harbor_ui"] - -EXPOSE 80 -