Skip to content
Snippets Groups Projects
Commit c161d195 authored by jurgenhaas's avatar jurgenhaas
Browse files

l3d#107 Use docker compose instead of docker-compose and also add a new alias `dc`

parent dd004ac6
No related branches found
No related tags found
No related merge requests found
Pipeline #397458 passed
......@@ -22,6 +22,7 @@ ARG GIT_EXTRAS_VERSION=5.1.0
ARG AHOY_VERSION=2.0.0
ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/
RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
set -eux && \
......@@ -80,9 +81,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
wget -q https://github.com/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
chmod +x /usr/local/bin/ahoy && \
\
wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
chmod +x /usr/local/bin/docker-compose && \
\
mkdir -p /usr/local/lib/docker/cli-plugins && \
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
......@@ -111,13 +109,12 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
ln -s /usr/local/bin/ahoy /usr/local/bin/a && \
ln -s /usr/local/bin/composer /usr/local/bin/c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/d-c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/dc && \
ln -s /usr/local/bin/drush /usr/local/bin/d && \
\
rm -rf /var/cache/* && \
rm -rf /root/.composer/cache
ADD bin/* /usr/local/bin/
ENV LAKEDROPS_DEV_DC_OPTIONS "-T"
ENV PHP_VERSION "${PHP_MAJOR_VERSION}"
......
#!/bin/bash
docker compose "$@"
......@@ -4,7 +4,7 @@ function setPermissions {
chmod -R g+w .
}
docker-compose exec ${LAKEDROPS_DEV_DC_OPTIONS} php drush "$@"
docker compose exec ${LAKEDROPS_DEV_DC_OPTIONS} php drush "$@"
if [[ "$1" == "gen" ]]; then
setPermissions
......
#!/bin/bash
docker-compose exec ${LAKEDROPS_DEV_DC_OPTIONS} php /var/www/html/vendor/bin/rector "$@"
docker compose exec ${LAKEDROPS_DEV_DC_OPTIONS} php /var/www/html/vendor/bin/rector "$@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment