diff --git a/go/Dockerfile b/go/Dockerfile index 09adf2d0..85fc66bd 100644 --- a/go/Dockerfile +++ b/go/Dockerfile @@ -6,13 +6,4 @@ # to run it: # 1 - tsuru-admin platform-add go -d https://raw.github.com/tsuru/basebuilder/master/go/Dockerfile -from ubuntu-debootstrap:14.04 -run locale-gen en_US.UTF-8 -env LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive -run apt-get update && apt-get install curl sudo -y --force-yes -run curl -Lo basebuilder.tar.gz https://github.com/tsuru/basebuilder/tarball/master -run mkdir /var/lib/tsuru -run tar -xvf basebuilder.tar.gz -C /var/lib/tsuru --strip 1 -run rm basebuilder.tar.gz -run cp /var/lib/tsuru/go/deploy /var/lib/tsuru -run /var/lib/tsuru/go/install +FROM tsuru/go diff --git a/go/Procfile b/go/Procfile deleted file mode 100644 index c79e0ba9..00000000 --- a/go/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: ./tsuru-app diff --git a/go/deploy b/go/deploy deleted file mode 100755 index 71377ded..00000000 --- a/go/deploy +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -el - -# Copyright 2015 basebuilder authors. All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -SOURCE_DIR=/var/lib/tsuru -source ${SOURCE_DIR}/base/deploy -source ${SOURCE_DIR}/config - -GO_VERSION=$(test -f /tmp/app_envs && source /tmp/app_envs && echo $GO_VERSION) -GO_VERSION=${GO_VERSION:-1.5} -echo "Installing Go ${GO_VERSION}..." -eval "$(gimme ${GO_VERSION})" - -pushd ${CURRENT_DIR} >/dev/null 2>&1 - -# do not fail if the application is not go gettable -set +e -go get -d ./... -set -e - -if [ -f ${APP_DIR}/.default_procfile ] -then - go build -o tsuru-app -fi - -popd >/dev/null 2>&1 diff --git a/go/install b/go/install deleted file mode 100755 index ed300dd6..00000000 --- a/go/install +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -el - -# Copyright 2015 basebuilder authors. All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -SOURCE_DIR=/var/lib/tsuru -$SOURCE_DIR/base/install - -source ${SOURCE_DIR}/config - -curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme -o /usr/bin/gimme -chmod +x /usr/bin/gimme -apt-get install curl bzr mercurial git bzr -qqy --force-yes -cp ${SOURCE_DIR}/go/Procfile ${SOURCE_DIR}/utils/Procfile -echo "GOPATH=${APP_DIR}" >> ${HOME}/.profile -echo 'PATH=$GOPATH:$PATH' >> ${HOME}/.profile -echo 'export PATH GOPATH' >> ${HOME}/.profile -echo 'export GIMME_SILENT_ENV=1' >> ${HOME}/.profile -echo '[ -f ${HOME}/.gimme/envs/latest.env ] && source ${HOME}/.gimme/envs/latest.env' >> ${HOME}/.profile