Skip to content

Commit

Permalink
chore: Update devcontainer feature versions for Alpine PHP FTP and Al…
Browse files Browse the repository at this point in the history
…pine Docker Outside of Docker
  • Loading branch information
cirolosapio committed May 5, 2024
1 parent b4f1422 commit 1d9c70a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alpine-docker-outside-of-docker",
"id": "alpine-docker-outside-of-docker",
"version": "0.0.14",
"version": "0.0.15",
"description": "Re-use the host docker socket, adding the Docker CLI to alpine container",
"documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-docker-outside-of-docker",
"installsAfter": [
Expand Down
4 changes: 2 additions & 2 deletions src/alpine-docker-outside-of-docker/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ set -e
SOCAT_PATH_BASE=/tmp/vscr-docker-from-docker
SOCAT_PID=\${SOCAT_PATH_BASE}.pid
if [ ! -f "\${SOCAT_PID}" ] || ! ps -p \$(cat \${SOCAT_PID}) > /dev/null; then
if [ ! -f "\${SOCAT_PID}" ] || ! kill -0 \$(cat \${SOCAT_PID}) 2>/dev/null; then
rm -rf /var/run/docker.sock
sudo socat UNIX-LISTEN:/var/run/docker.sock,fork,mode=660,user=$CURRENT_USER,backlog=128 UNIX-CONNECT:/var/run/docker-host.sock 2>&1
sudo socat UNIX-LISTEN:/var/run/docker.sock,fork,mode=660,user=$CURRENT_USER,backlog=128 UNIX-CONNECT:/var/run/docker-host.sock 2>&1 > /dev/null & echo $! > \${SOCAT_PID}
fi
EOF

Expand Down
2 changes: 1 addition & 1 deletion src/alpine-php-ftp/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alpine-php-ftp",
"id": "alpine-php-ftp",
"version": "0.0.1",
"version": "0.0.2",
"description": "Installs ftp extension for php on alpine",
"documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-php-ftp"
}
2 changes: 1 addition & 1 deletion src/alpine-php-ftp/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

echo "Activating feature 'alpine-ftp-pcntl'"
echo "Activating feature 'alpine-php-ftp'"

docker-php-ext-install ftp

Expand Down

0 comments on commit 1d9c70a

Please sign in to comment.