Skip to content

Commit

Permalink
Merge pull request #148 from docksal/develop
Browse files Browse the repository at this point in the history 
Release 2.10.0
  • Loading branch information
@lmakarov
lmakarov authored Nov 12, 2019
2 parents 5d0ab37 + 2dba73b commit d7ef3d3
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 33 deletions.
16 changes: 8 additions & 8 deletions 7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ ENV COMPOSER_VERSION=1.9.0 \
DRUPAL_CHECK_VERSION=1.0.13 \
DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.3 \
WPCLI_VERSION=2.3.0 \
BLACKFIRE_VERSION=1.22.0 \
PLATFORMSH_CLI_VERSION=3.47.0
BLACKFIRE_VERSION=1.27.4 \
PLATFORMSH_CLI_VERSION=3.49.1
RUN set -xe; \
# Composer
curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer; \
Expand All @@ -262,7 +262,7 @@ SHELL ["/bin/bash", "-c"]

# PHP tools (installed as user)
ENV MG_CODEGEN_VERSION=1.11.0 \
TERMINUS_VERSION=2.1.0 \
TERMINUS_VERSION=2.2.0 \
DRUSH_BACKDROP_VERSION=1.0.0
# Don't use -x here, as the output may be excessive
RUN set -e; \
Expand Down Expand Up @@ -302,9 +302,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil

# Node.js (installed as user)
ENV \
NVM_VERSION=0.34.0 \
NODE_VERSION=10.16.3 \
YARN_VERSION=1.17.3
NVM_VERSION=0.35.0 \
NODE_VERSION=12.13.0 \
YARN_VERSION=1.19.1
# Don't use -x here, as the output may be excessive
RUN set -e; \
# NVM and a defaut Node.js version
Expand All @@ -319,7 +319,7 @@ RUN set -e; \
# Ruby (installed as user)
ENV \
RVM_VERSION_INSTALL=1.29.9 \
RUBY_VERSION_INSTALL=2.6.4
RUBY_VERSION_INSTALL=2.6.5
# Don't use -x here, as the output may be excessive
RUN set -e; \
# Public GPG servers are not realiable, so downloading keys from rvm.io instead.
Expand Down Expand Up @@ -358,7 +358,7 @@ RUN set -e; \

# Python (installed as user)
ENV \
PYENV_VERSION_INSTALL=1.2.13
PYENV_VERSION_INSTALL=1.2.14
# PYTHON_VERSION_INSTALL=3.7.0
RUN set -xe; \
git clone --depth 1 -b v${PYENV_VERSION_INSTALL} https://github.com/pyenv/pyenv.git $HOME/.pyenv; \
Expand Down
2 changes: 1 addition & 1 deletion .../code-server/supervisord-code-server.conf → ...ervisor/supervisord-code-server.conf.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VS Code Server web IDE
[program:code-server]
# Using bash -lc here to load docker user profile (necessary for nvn/node to initialize)
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http --no-auth'
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http {{ if not (getenv "PASSWORD") }}--no-auth{{ end }}'
stdout_logfile = /var/log/supervisor/code-server-stdout
stderr_logfile = /var/log/supervisor/code-server-stderr
7 changes: 5 additions & 2 deletions 7.1/startup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ ide_mode_enable ()
echo-debug "Enabling web IDE..."
# Enabled only code-server service (disabled all other services)
# TODO: [v3] split IDE/cli and php-fpm entirely
rm -f /etc/supervisor/conf.d/supervisord-*
ln -s /opt/code-server/supervisord-code-server.conf /etc/supervisor/conf.d/
rm -f /etc/supervisor/conf.d/supervisord-*.conf
if [[ "$IDE_PASSWORD" != "" ]]; then
export PASSWORD="${IDE_PASSWORD}"
fi
render_tmpl "/etc/supervisor/conf.d/supervisord-code-server.conf"
mkdir -p ${VSCODE_HOME}/User
ln -s /opt/code-server/settings.json ${VSCODE_HOME}/User/
}
Expand Down
16 changes: 8 additions & 8 deletions 7.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ ENV COMPOSER_VERSION=1.9.0 \
DRUPAL_CHECK_VERSION=1.0.13 \
DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.3 \
WPCLI_VERSION=2.3.0 \
BLACKFIRE_VERSION=1.22.0 \
PLATFORMSH_CLI_VERSION=3.47.0
BLACKFIRE_VERSION=1.27.4 \
PLATFORMSH_CLI_VERSION=3.49.1
RUN set -xe; \
# Composer
curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer; \
Expand All @@ -260,7 +260,7 @@ SHELL ["/bin/bash", "-c"]

# PHP tools (installed as user)
ENV MG_CODEGEN_VERSION=1.11.0 \
TERMINUS_VERSION=2.1.0 \
TERMINUS_VERSION=2.2.0 \
DRUSH_BACKDROP_VERSION=1.0.0
# Don't use -x here, as the output may be excessive
RUN set -e; \
Expand Down Expand Up @@ -300,9 +300,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil

# Node.js (installed as user)
ENV \
NVM_VERSION=0.34.0 \
NODE_VERSION=10.16.3 \
YARN_VERSION=1.17.3
NVM_VERSION=0.35.0 \
NODE_VERSION=12.13.0 \
YARN_VERSION=1.19.1
# Don't use -x here, as the output may be excessive
RUN set -e; \
# NVM and a defaut Node.js version
Expand All @@ -317,7 +317,7 @@ RUN set -e; \
# Ruby (installed as user)
ENV \
RVM_VERSION_INSTALL=1.29.9 \
RUBY_VERSION_INSTALL=2.6.4
RUBY_VERSION_INSTALL=2.6.5
# Don't use -x here, as the output may be excessive
RUN set -e; \
# Public GPG servers are not realiable, so downloading keys from rvm.io instead.
Expand Down Expand Up @@ -356,7 +356,7 @@ RUN set -e; \

# Python (installed as user)
ENV \
PYENV_VERSION_INSTALL=1.2.13
PYENV_VERSION_INSTALL=1.2.14
# PYTHON_VERSION_INSTALL=3.7.0
RUN set -xe; \
git clone --depth 1 -b v${PYENV_VERSION_INSTALL} https://github.com/pyenv/pyenv.git $HOME/.pyenv; \
Expand Down
2 changes: 1 addition & 1 deletion .../code-server/supervisord-code-server.conf → ...ervisor/supervisord-code-server.conf.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VS Code Server web IDE
[program:code-server]
# Using bash -lc here to load docker user profile (necessary for nvn/node to initialize)
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http --no-auth'
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http {{ if not (getenv "PASSWORD") }}--no-auth{{ end }}'
stdout_logfile = /var/log/supervisor/code-server-stdout
stderr_logfile = /var/log/supervisor/code-server-stderr
7 changes: 5 additions & 2 deletions 7.2/startup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ ide_mode_enable ()
echo-debug "Enabling web IDE..."
# Enabled only code-server service (disabled all other services)
# TODO: [v3] split IDE/cli and php-fpm entirely
rm -f /etc/supervisor/conf.d/supervisord-*
ln -s /opt/code-server/supervisord-code-server.conf /etc/supervisor/conf.d/
rm -f /etc/supervisor/conf.d/supervisord-*.conf
if [[ "$IDE_PASSWORD" != "" ]]; then
export PASSWORD="${IDE_PASSWORD}"
fi
render_tmpl "/etc/supervisor/conf.d/supervisord-code-server.conf"
mkdir -p ${VSCODE_HOME}/User
ln -s /opt/code-server/settings.json ${VSCODE_HOME}/User/
}
Expand Down
16 changes: 8 additions & 8 deletions 7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ ENV COMPOSER_VERSION=1.9.0 \
DRUPAL_CHECK_VERSION=1.0.13 \
DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.3 \
WPCLI_VERSION=2.3.0 \
BLACKFIRE_VERSION=1.22.0 \
PLATFORMSH_CLI_VERSION=3.47.0
BLACKFIRE_VERSION=1.27.4 \
PLATFORMSH_CLI_VERSION=3.49.1
RUN set -xe; \
# Composer
curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer; \
Expand All @@ -260,7 +260,7 @@ SHELL ["/bin/bash", "-c"]

# PHP tools (installed as user)
ENV MG_CODEGEN_VERSION=1.11.0 \
TERMINUS_VERSION=2.1.0 \
TERMINUS_VERSION=2.2.0 \
DRUSH_BACKDROP_VERSION=1.0.0
# Don't use -x here, as the output may be excessive
RUN set -e; \
Expand Down Expand Up @@ -300,9 +300,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil

# Node.js (installed as user)
ENV \
NVM_VERSION=0.34.0 \
NODE_VERSION=10.16.3 \
YARN_VERSION=1.17.3
NVM_VERSION=0.35.0 \
NODE_VERSION=12.13.0 \
YARN_VERSION=1.19.1
# Don't use -x here, as the output may be excessive
RUN set -e; \
# NVM and a defaut Node.js version
Expand All @@ -317,7 +317,7 @@ RUN set -e; \
# Ruby (installed as user)
ENV \
RVM_VERSION_INSTALL=1.29.9 \
RUBY_VERSION_INSTALL=2.6.4
RUBY_VERSION_INSTALL=2.6.5
# Don't use -x here, as the output may be excessive
RUN set -e; \
# Public GPG servers are not realiable, so downloading keys from rvm.io instead.
Expand Down Expand Up @@ -356,7 +356,7 @@ RUN set -e; \

# Python (installed as user)
ENV \
PYENV_VERSION_INSTALL=1.2.13
PYENV_VERSION_INSTALL=1.2.14
# PYTHON_VERSION_INSTALL=3.7.0
RUN set -xe; \
git clone --depth 1 -b v${PYENV_VERSION_INSTALL} https://github.com/pyenv/pyenv.git $HOME/.pyenv; \
Expand Down
2 changes: 1 addition & 1 deletion .../code-server/supervisord-code-server.conf → ...ervisor/supervisord-code-server.conf.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VS Code Server web IDE
[program:code-server]
# Using bash -lc here to load docker user profile (necessary for nvn/node to initialize)
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http --no-auth'
command = gosu docker bash -lc '/usr/local/bin/code-server --user-data-dir=/home/docker/code-server -p 8080 /var/www --allow-http {{ if not (getenv "PASSWORD") }}--no-auth{{ end }}'
stdout_logfile = /var/log/supervisor/code-server-stdout
stderr_logfile = /var/log/supervisor/code-server-stderr
7 changes: 5 additions & 2 deletions 7.3/startup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ ide_mode_enable ()
echo-debug "Enabling web IDE..."
# Enabled only code-server service (disabled all other services)
# TODO: [v3] split IDE/cli and php-fpm entirely
rm -f /etc/supervisor/conf.d/supervisord-*
ln -s /opt/code-server/supervisord-code-server.conf /etc/supervisor/conf.d/
rm -f /etc/supervisor/conf.d/supervisord-*.conf
if [[ "$IDE_PASSWORD" != "" ]]; then
export PASSWORD="${IDE_PASSWORD}"
fi
render_tmpl "/etc/supervisor/conf.d/supervisord-code-server.conf"
mkdir -p ${VSCODE_HOME}/User
ln -s /opt/code-server/settings.json ${VSCODE_HOME}/User/
}
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,8 @@ Starting with version 2.8, there is the `ide` flavor of the images, which comes
2.8-php7.3-ide
```

`IDE_PASSWORD`

Store your preferred password in this variable if you need to password protect the IDE environment.

[See docs](https://docs.docksal.io/en/master/tools/ide/) for instructions on using Coder in Docksal.

0 comments on commit d7ef3d3

Please sign in to comment.