From 753aa9af2cdbbdad452541c55d119469c730f98f Mon Sep 17 00:00:00 2001 From: zhongjin Date: Thu, 11 May 2023 19:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'Dockerfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9e8f56..c895a80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,24 +15,6 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -#ENV CARTODB_VERSION=v4.11.152 -#ENV CARTODB_VERSION=v4.12.9 -#ENV CARTODB_VERSION=v4.12.26 -#ENV CARTODB_VERSION=v4.12.30 -ENV CARTODB_VERSION=master -#ENV SQLAPI_VERSION=1.47.2 -ENV SQLAPI_VERSION=master -#ENV CRANKSHAFT_VERSION=0.8.1 -ENV CRANKSHAFT_VERSION=master -#ENV WINDSHAFT_VERSION=5.4.0 -ENV WINDSHAFT_VERSION=master -#ENV DATASERVICES_VERSION=0.0.2 -ENV DATASERVICES_VERSION=master -#ENV DATAERVICESAPI_VERSION=0.30.5-server -ENV DATAERVICESAPI_VERSION=master -#ENV OBSERVATORY_VERSION=1.9.0 -ENV OBSERVATORY_VERSION=master - RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \ apt-get install -y -q \ build-essential \ @@ -111,9 +93,29 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \ net-tools \ ruby2.5-dev \ xz-utils \ + nano \ + net-tools \ --no-install-recommends && \ rm -rf /var/lib/apt/lists/* +#ENV CARTODB_VERSION=v4.11.152 +#ENV CARTODB_VERSION=v4.12.9 +#ENV CARTODB_VERSION=v4.12.26 +#ENV CARTODB_VERSION=v4.12.30 +ENV CARTODB_VERSION=master +#ENV SQLAPI_VERSION=1.47.2 +ENV SQLAPI_VERSION=master +#ENV CRANKSHAFT_VERSION=0.8.1 +ENV CRANKSHAFT_VERSION=master +#ENV WINDSHAFT_VERSION=5.4.0 +ENV WINDSHAFT_VERSION=master +#ENV DATASERVICES_VERSION=0.0.2 +ENV DATASERVICES_VERSION=master +#ENV DATAERVICESAPI_VERSION=0.30.5-server +ENV DATAERVICESAPI_VERSION=master +#ENV OBSERVATORY_VERSION=1.9.0 +ENV OBSERVATORY_VERSION=master + RUN git config --global user.email you@example.com RUN git config --global user.name "Your Name"