mirror of
https://github.com/fleetbase/fleetbase.git
synced 2026-01-08 07:16:49 +00:00
now uses installer, dropped entrypoint scripts
This commit is contained in:
@@ -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"]
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Call the original entrypoint
|
||||
exec /sbin/ssm-parent -c .ssm-parent.yaml run -- docker-php-entrypoint "$@"
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Call the original entrypoint
|
||||
exec docker-php-entrypoint "$@"
|
||||
Reference in New Issue
Block a user