From 9cc71be60733c6156036aca0d8a1529f219a4180 Mon Sep 17 00:00:00 2001 From: priom Date: Tue, 7 Aug 2018 13:58:19 -0400 Subject: [PATCH] removed redundant docker images --- containers/docker/develop-alpine/Dockerfile | 14 ------- containers/docker/develop-ubuntu/Dockerfile | 17 --------- containers/docker/master-alpine/Dockerfile | 14 ------- containers/docker/master-ubuntu/Dockerfile | 17 --------- containers/vagrant/.gitignore | 1 - containers/vagrant/Vagrantfile | 38 ------------------- .../vagrant/provisioners/shell/centos.sh | 11 ------ .../vagrant/provisioners/shell/debian.sh | 11 ------ .../vagrant/provisioners/shell/ubuntu.sh | 11 ------ docker-compose.yml | 8 ++-- .../pg/Dockerfile => docker/pg/Dockerfile.pg | 0 .../shyftApi/Dockerfile.api | 0 .../shyftApi/wait-for.sh | 0 .../shyftGeth/Dockerfile.geth | 0 .../shyftUi/Dockerfile.ui | 0 15 files changed, 4 insertions(+), 138 deletions(-) delete mode 100644 containers/docker/develop-alpine/Dockerfile delete mode 100644 containers/docker/develop-ubuntu/Dockerfile delete mode 100644 containers/docker/master-alpine/Dockerfile delete mode 100644 containers/docker/master-ubuntu/Dockerfile delete mode 100644 containers/vagrant/.gitignore delete mode 100644 containers/vagrant/Vagrantfile delete mode 100755 containers/vagrant/provisioners/shell/centos.sh delete mode 100755 containers/vagrant/provisioners/shell/debian.sh delete mode 100755 containers/vagrant/provisioners/shell/ubuntu.sh rename containers/docker/develop-alpine/pg/Dockerfile => docker/pg/Dockerfile.pg (100%) rename containers/docker/develop-alpine/shyftApi/Dockerfile => docker/shyftApi/Dockerfile.api (100%) rename {containers/docker/develop-alpine => docker}/shyftApi/wait-for.sh (100%) rename containers/docker/develop-alpine/shyftGeth/Dockerfile => docker/shyftGeth/Dockerfile.geth (100%) rename containers/docker/develop-alpine/shyftUi/Dockerfile => docker/shyftUi/Dockerfile.ui (100%) diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile deleted file mode 100644 index 27998998ea..0000000000 --- a/containers/docker/develop-alpine/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM alpine:3.7 - -RUN \ - apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/ShyftNetwork/go-empyrean && \ - (cd go-empyrean && make geth) && \ - cp go-empyrean/build/bin/geth /geth && \ - apk del go git make gcc musl-dev linux-headers && \ - rm -rf /go-empyrean && rm -rf /var/cache/apk/* - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile deleted file mode 100644 index 68e991cf9b..0000000000 --- a/containers/docker/develop-ubuntu/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:xenial - -ENV PATH=/usr/lib/go-1.9/bin:$PATH - -RUN \ - apt-get update && apt-get upgrade -q -y && \ - apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/empyrean/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ - rm -rf /go-ethereum - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile deleted file mode 100644 index 7830495bd2..0000000000 --- a/containers/docker/master-alpine/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM alpine:3.7 - -RUN \ - apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/empyrean/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev linux-headers && \ - rm -rf /go-ethereum && rm -rf /var/cache/apk/* - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile deleted file mode 100644 index 4aeb19c292..0000000000 --- a/containers/docker/master-ubuntu/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:xenial - -ENV PATH=/usr/lib/go-1.9/bin:$PATH - -RUN \ - apt-get update && apt-get upgrade -q -y && \ - apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/empyrean/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ - rm -rf /go-ethereum - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] diff --git a/containers/vagrant/.gitignore b/containers/vagrant/.gitignore deleted file mode 100644 index 8000dd9db4..0000000000 --- a/containers/vagrant/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.vagrant diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile deleted file mode 100644 index f81238cac9..0000000000 --- a/containers/vagrant/Vagrantfile +++ /dev/null @@ -1,38 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -require 'yaml' - -VAGRANTFILE_API_VERSION = 2 -VM_RAM = 2048 - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.define "ubuntu", :primary => true do |ubuntu| - ubuntu.vm.box = "ubuntu/trusty64" - ubuntu.vm.provision "shell", :path => "provisioners/shell/ubuntu.sh" - end - - config.vm.define "debian", :primary => true do |debian| - debian.vm.box = "debian/jessie64" - debian.vm.provision "shell", :path => "provisioners/shell/debian.sh" - end - - config.vm.define "centos", :autostart => false do |centos| - centos.vm.box = "centos/7" - centos.vm.provision "shell", :path => "provisioners/shell/centos.sh" - end - - config.vm.provider "virtualbox" do |vb| - vb.memory = VM_RAM - end - - config.vm.provider "libvirt" do |lv| - lv.memory = VM_RAM - - config.vm.synced_folder ".", "/home/vagrant/sync", :disabled => true - end - - config.vm.synced_folder ".", "/vagrant", :disabled => true - config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/empyrean/go-ethereum" -end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh deleted file mode 100755 index 0cf46065c9..0000000000 --- a/containers/vagrant/provisioners/shell/centos.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sudo yum install -y git wget -sudo yum update -y - -wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz -sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz - -GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/build/bin/" - -echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/debian.sh b/containers/vagrant/provisioners/shell/debian.sh deleted file mode 100755 index 6bb5ce7731..0000000000 --- a/containers/vagrant/provisioners/shell/debian.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sudo apt-get install -y build-essential git-all wget -sudo apt-get update - -wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz -sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz - -GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/build/bin/" - -echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/ubuntu.sh b/containers/vagrant/provisioners/shell/ubuntu.sh deleted file mode 100755 index 6bb5ce7731..0000000000 --- a/containers/vagrant/provisioners/shell/ubuntu.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sudo apt-get install -y build-essential git-all wget -sudo apt-get update - -wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz -sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz - -GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/build/bin/" - -echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/docker-compose.yml b/docker-compose.yml index 4c4c75ff49..b6d88f0f5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: shyftgeth: build: context: $PWD - dockerfile: containers/docker/develop-alpine/shyftGeth/Dockerfile + dockerfile: docker/shyftGeth/Dockerfile.geth ports: - "8545:8545" - "8546:8546" @@ -27,7 +27,7 @@ services: pg: build: context: $PWD - dockerfile: containers/docker/develop-alpine/pg/Dockerfile + dockerfile: docker/pg/Dockerfile.pg volumes: - ./pg-data:/var/lib/postgresql/data ports: @@ -40,7 +40,7 @@ services: shyft_block_api: build: context: $PWD - dockerfile: containers/docker/develop-alpine/shyftApi/Dockerfile + dockerfile: docker/shyftApi/Dockerfile.api # volumes: # - ./shyftBlockExplorerApi:/go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi working_dir: /go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi @@ -61,7 +61,7 @@ services: shyft_block_ui: build: context: $PWD - dockerfile: containers/docker/develop-alpine/shyftUi/Dockerfile + dockerfile: docker/shyftUi/Dockerfile.ui # volumes: # - ./shyftBlockExplorerApi:/go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi ports: diff --git a/containers/docker/develop-alpine/pg/Dockerfile b/docker/pg/Dockerfile.pg similarity index 100% rename from containers/docker/develop-alpine/pg/Dockerfile rename to docker/pg/Dockerfile.pg diff --git a/containers/docker/develop-alpine/shyftApi/Dockerfile b/docker/shyftApi/Dockerfile.api similarity index 100% rename from containers/docker/develop-alpine/shyftApi/Dockerfile rename to docker/shyftApi/Dockerfile.api diff --git a/containers/docker/develop-alpine/shyftApi/wait-for.sh b/docker/shyftApi/wait-for.sh similarity index 100% rename from containers/docker/develop-alpine/shyftApi/wait-for.sh rename to docker/shyftApi/wait-for.sh diff --git a/containers/docker/develop-alpine/shyftGeth/Dockerfile b/docker/shyftGeth/Dockerfile.geth similarity index 100% rename from containers/docker/develop-alpine/shyftGeth/Dockerfile rename to docker/shyftGeth/Dockerfile.geth diff --git a/containers/docker/develop-alpine/shyftUi/Dockerfile b/docker/shyftUi/Dockerfile.ui similarity index 100% rename from containers/docker/develop-alpine/shyftUi/Dockerfile rename to docker/shyftUi/Dockerfile.ui