Updates on docs

AlexRogalskiy · Jun 18, 2022 · dc7ea5d · dc7ea5d
1 parent 05f8adb
commit dc7ea5d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,9 @@
 #####################################################
 ###### General Configuration
 #####################################################
+COMPOSE_PROJECT_NAME=styled-java-patterns
+COMPOSE_HTTP_TIMEOUT=240
+
 VOLUMES_DRIVER=local
 NETWORKS_DRIVER=bridge
 

diff --git a/distribution/docker-images/dev.Dockerfile b/distribution/docker-images/dev.Dockerfile
@@ -57,7 +57,7 @@ ARG DATA_DIR="/usr/src/data"
 ARG TEMP_DIR="${TEMP_DIR:-/tmp}"
 
 ARG APT_INSTALL_PACKAGES="git curl tini dos2unix locales"
-ARG APT_INSTALL_OPTIONS="--assume-yes --no-install-recommends --only-upgrade"
+ARG APT_INSTALL_OPTIONS="--assume-yes --no-install-recommends --only-upgrade --allow-downgrades -allow-remove-essential --allow-change-held-packages"
 
 ## setup image labels
 LABEL "name"="$IMAGE_NAME" \
@@ -89,7 +89,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     TZ=UTC \
     LC_ALL="en_US.UTF-8" \
     LANG=$LC_ALL \
-    LANGUAGE="en_US:en" \
+    LANGUAGE=$LC_ALL \
     LC_CTYPE=$LC_ALL \
     PYTHONIOENCODING=UTF-8 \
     PYTHONLEGACYWINDOWSSTDIO=UTF-8 \
@@ -135,14 +135,18 @@ WORKDIR $APP_DIR
 ## install dependencies
 RUN echo "**** Installing build packages ****"
 ## RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update \
-    && apt-get upgrade -yqq \
-    && apt-get install $APT_INSTALL_OPTIONS $APT_INSTALL_PACKAGES 2>&1 > /dev/null \
+RUN apt-get -yqq $APT_INSTALL_OPTIONS update \
+    && apt-get -yqq $APT_INSTALL_OPTIONS upgrade \
+    && apt-get -yqq --force-yes $APT_INSTALL_OPTIONS dist-upgrade \
+    && apt-get -yqq $APT_INSTALL_OPTIONS install $APT_INSTALL_PACKAGES 2>&1 > /dev/null \
+    && locale-gen en_US.UTF-8 \
+    && update-locale LANG=${LANG} LANGUAGE=${LANGUAGE} LC_ALL=${LC_ALL} \
     && apt-get -yqq autoclean \
     && apt-get -yqq clean \
     && apt-get -yqq autoremove --purge \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/* \
+    && rm -rf /usr/share/man/* /usr/share/doc/* /usr/share/info/* /usr/share/groff/* /usr/share/lintian/* /usr/share/linda/* \
     && rm -rf /var/tmp/* \
     && rm -rf /var/cache/apt/*
 

diff --git a/makefiles/utils/commons.mk b/makefiles/utils/commons.mk
@@ -80,7 +80,7 @@ COMPOSE_DOCKER_CLI_BUILD 	:= 1
 WGET_OPTS 						    := --no-check-certificate
 
 # CURL_OPTS stores curl options
-CURL_OPTS 						    := --silent --show-error --location --fail --retry 3
+CURL_OPTS 						    := --silent --show-error --location --fail --retry 3 --retry-max-time 180
 
 # Date/time vars
 DATE_TIME_LONG			      := $(shell date +%Y-%m-%d' '%H:%M:%S)

diff --git a/package.json b/package.json
@@ -180,7 +180,7 @@
 		"crowdin:upload": "crowdin --config crowdin.yml upload sources --auto-update -b $(git rev-parse --abbrev-ref HEAD)",
 		"csv:view": "pspg -s 17 --csv \"datas.csv\"",
 		"deploy": "deploy-to-gh-pages --local --update site",
-		"deps": "npm install",
+		"deps": "npm install -- --loglevel error",
 		"describe": "npm-scripts-info",
 		"docker:build": "docker build -f ./distribution/docker-images/dev.Dockerfile -t $npm_package_config_image .",
 		"docker:config": "docker-compose config",