Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase From Main #8

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Rebase From Main #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67b4554
Merge pull request #7 from lapig-ufg/develop
James-jamames Oct 19, 2023
36c00e3
+ docker file update
James-jamames Oct 19, 2023
f2551af
+ update docker file production
James-jamames Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions docker/homologation/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,12 @@ USER root

WORKDIR /var/www/server




COPY ./docker/homologation/deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./docker/homologation/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/homologation/post_deploy.sh /var/www/post_deploy.sh


COPY ./version.jso* /var/html/version.json



# setup composer and laravel
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
git clone -b ${BRANCH} ${URL_TO_APPLICATION_GITHUB} /tmp/app && \
Expand Down
9 changes: 3 additions & 6 deletions docker/production/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,14 @@ RUN apt-get update \



COPY ./deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./post_deploy.sh /var/www/post_deploy.sh
COPY ./docker/production/deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./docker/production/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/production/post_deploy.sh /var/www/post_deploy.sh

# Development config files
COPY ./ssh /root/.ssh

COPY ./version.jso* /var/html/version.json



# setup composer and laravel
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
git clone -b ${BRANCH} ${URL_TO_APPLICATION_GITHUB} /tmp/app && \
Expand Down
Loading