diff --git a/Dockerfile b/Dockerfile index 36c4e40..392c6e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ RUN /bin/cp -f /usr/share/zoneinfo/Asia/Tokyo /etc/localtime \ \ && apt-get install -y --no-install-recommends \ ca-certificates curl git zip jq bc vim \ + locales locales-all \ python python-yaml \ python-pip python-dev libffi-dev \ libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev libtidy-dev libssl-dev \ @@ -39,7 +40,7 @@ RUN curl -sL -o /tmp/docker-client.tgz https://get.docker.com/builds/Linux/x86_6 && curl -sL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` \ >| /usr/local/bin/docker-compose \ && chmod +x /usr/local/bin/docker-compose \ - && rm -rf /tmp/* + && rm -rf /tmp/* /usr/bin/completion #================== # Yarn @@ -59,7 +60,8 @@ RUN set -ex \ #================== # Anyenv #================== -ENV ANY_ENV_HOME /root/.anyenv +ENV ANYENV_HOME /root/.anyenv +ENV ANYENV_ENV $ANYENV_HOME/envs ENV PATH $ANY_ENV_HOME/bin:$PATH COPY ansible /tmp/ansible WORKDIR /tmp/ansible @@ -68,4 +70,30 @@ RUN mkdir -p /etc/ansible \ && ansible-playbook -vvv playbook.yml \ && rm -rf /tmp/* +#================== +# Node +#================== +ENV PATH $ANYENV_ENV/ndenv/bin:$ANYENV_ENV/ndenv/shims:$PATH +ENV NDENV_ROOT $ANYENV_ENV/ndenv + +#================== +# Python3 +#================== +ENV PATH $ANYENV_ENV/pyenv/bin:$ANYENV_ENV/pyenv/shims:$PATH +ENV PYENV_ROOT $ANYENV_ENV/pyenv + +#================== +# Go +#================== +ENV PATH $ANYENV_ENV/goenv/bin:$ANYENV_ENV/goenv/shims:$PATH +ENV GOENV_ROOT $ANYENV_ENV/goenv + +#================== +# PHP +#================== +ENV PATH $ANYENV_ENV/phpenv/bin:$ANYENV_ENV/phpenv/shims:$PATH +ENV PHPENV_ROOT $ANYENV_ENV/phpenv + +ENV LANG=en_US.UTF-8 + WORKDIR /root diff --git a/Makefile b/Makefile index 3f5a785..2b91789 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME := generic-build REGISTRY := whiteplus/$(NAME) -VERSION := 20170617 +VERSION := 20170821 .PHONY: build push