Skip to content

Commit

Permalink
chore: Update devcontainer feature versions for Alpine-Docker-Outside…
Browse files Browse the repository at this point in the history
…-of-Docker, Alpine-Bat, Alpine-GH-Copilot-CLI, Alpine-Magento-Cloud-CLI, Alpine-Navi, Alpine-Node, Alpine-Nushell, and Alpine-Ohmyzsh
  • Loading branch information
cirolosapio committed Apr 26, 2024
1 parent 1e9daf4 commit d54c16c
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
- [alpine-deno](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-deno)
- [alpine-docker-outside-of-docker](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-docker-outside-of-docker)
- [alpine-gh-cli](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-gh-cli)
- [alpine-gh-copilot-cli](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-gh-copilot-cli)
- [alpine-git](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-git)
- [alpine-mage2postman](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-mage2postman)
- [alpine-magento-cloud-cli](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-magento-cloud-cli)
Expand Down
6 changes: 3 additions & 3 deletions src/alpine-docker-outside-of-docker/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
exit 0
fi

apk add --no-cache docker
apk --no-cache add docker

CURRENT_USER=$(getent passwd 1000 | cut -d: -f1)

if [[ -z $CURRENT_USER ]]; then
ln -s /var/run/docker-host.sock /var/run/docker.sock
echo -e '#!/bin/sh\nexec "$@"' > /usr/local/share/docker-init.sh
else
apk add --no-cache socat sudo
apk --no-cache add socat sudo
echo "$CURRENT_USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$CURRENT_USER
chmod 0440 /etc/sudoers.d/$CURRENT_USER

Expand Down Expand Up @@ -47,7 +47,7 @@ fi
chmod +x /usr/local/share/docker-init.sh

if [[ $INSTALLDOCKERCOMPOSE == "true" ]]; then
apk add --no-cache docker-compose
apk --no-cache add docker-compose
fi

if command -v zsh &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion src/alpine-n98-magerun2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Installs n98-magerun2 on alpine

| Options Id | Description | Type | Default Value |
|-----|-----|-----|-----|
| version | Version of n98-magerun2 to install | string | 7.3.1 |
| version | Version of n98-magerun2 to install | string | 7.4.0 |



Expand Down
5 changes: 3 additions & 2 deletions src/alpine-n98-magerun2/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alpine-n98-magerun2",
"id": "alpine-n98-magerun2",
"version": "0.0.15",
"version": "0.0.16",
"description": "Installs n98-magerun2 on alpine",
"documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-n98-magerun2",
"legacyIds": [
Expand All @@ -14,9 +14,10 @@
"options": {
"version": {
"type": "string",
"default": "7.3.1",
"default": "7.4.0",
"description": "Version of n98-magerun2 to install",
"proposals": [
"7.4.0",
"7.3.1",
"6.1.1"
]
Expand Down
2 changes: 0 additions & 2 deletions src/alpine-n98-magerun2/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ set -e

echo "Activating feature 'alpine-n98-magerun2'"

VERSION="${VERSION:-7.3.1}"

wget -q https://files.magerun.net/n98-magerun2-${VERSION}.phar -O /usr/local/bin/n98-magerun2.phar
# shasum -a256 n98-magerun2.phar
chmod +x /usr/local/bin/n98-magerun2.phar
Expand Down
2 changes: 1 addition & 1 deletion src/alpine-node/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

echo "Activating feature 'alpine-node'"

apk add --no-cache nodejs npm
apk --no-cache add nodejs npm

if [[ $COREPACK == "true" ]]; then
npm i -g corepack
Expand Down
2 changes: 1 addition & 1 deletion src/alpine-phpstorm-libs/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -e

echo "Activating feature 'alpine-phpstorm-libs'"

apk add --no-cache gcompat libxi libxrender libxtst
apk --no-cache add gcompat libxi libxrender libxtst

echo 'Done!'

0 comments on commit d54c16c

Please sign in to comment.