now uses installer, dropped entrypoint scripts

This commit is contained in:
Ronald A. Richardson
2023-05-30 17:48:08 +08:00
parent ae5fb66e5b
commit fb4e51d1ba
6 changed files with 75 additions and 120 deletions

View File

@@ -52,14 +52,6 @@ COPY --chown=www-data:nogroup . ./
USER root
# Copy entrypoint.sh
COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
# Copy entrypoint-app.sh
COPY docker/entrypoint-app.sh /entrypoint-app.sh
RUN chmod +x /entrypoint-app.sh
# Set environment
ARG ENVIRONMENT=production
ENV APP_ENV=$ENVIRONMENT
@@ -84,7 +76,7 @@ CMD ["go-crond", "--verbose", "--no-auto", "root:./crontab"]
# Application dev stage
FROM base as app-dev
ENTRYPOINT ["/entrypoint.sh"]
ENTRYPOINT ["docker-php-entrypoint"]
CMD ["php-fpm"]
# Events stage
@@ -99,5 +91,5 @@ CMD ["php", "artisan", "queue:work", "sqs"]
# Application stage
FROM base as app
ENTRYPOINT ["/entrypoint-app.sh"]
ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
CMD ["php-fpm"]

View File

@@ -1,5 +0,0 @@
#!/bin/sh
set -e
# Call the original entrypoint
exec /sbin/ssm-parent -c .ssm-parent.yaml run -- docker-php-entrypoint "$@"

View File

@@ -1,5 +0,0 @@
#!/bin/sh
set -e
# Call the original entrypoint
exec docker-php-entrypoint "$@"