Skip to content

Commit

Permalink
update build to get files
Browse files Browse the repository at this point in the history
  • Loading branch information
Colin McFadden committed Jul 12, 2024
1 parent 10b800f commit 240d4f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
echo $GITHUB_SHA > REVISION
# Build the Docker image
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG docker/
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
# Push the Docker image to the ECR repository
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
10 changes: 5 additions & 5 deletions docker/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ RUN pecl install redis && docker-php-ext-enable redis
RUN docker-php-ext-install pgsql pdo_pgsql pdo
RUN pecl install mongodb && docker-php-ext-enable mongodb
RUN a2enmod rewrite && a2enmod headers
COPY get-docker.sh /root/
COPY docker/get-docker.sh /root/
RUN chmod +x /root/get-docker.sh
RUN /root/get-docker.sh
COPY commands/* /usr/local/bin/
COPY docker/commands/* /usr/local/bin/
RUN mkdir /scratch
RUN mkdir -p /tmp
RUN mkdir -p /opt
COPY ../ /var/www/html/
COPY . /var/www/html/
WORKDIR /var/www/html
ARG DOCKER_SCRATCH_DIR
ENV DOCKER_SCRATCH_DIR $DOCKER_SCRATCH_DIR
# don't run this in prod
RUN sed -i "s|/scratch:|$DOCKER_SCRATCH_DIR:|g" /usr/local/bin/*
RUN sed -i 's/docker run/docker run --platform=linux\/amd64/g' /usr/local/bin/*
# RUN sed -i "s|/scratch:|$DOCKER_SCRATCH_DIR:|g" /usr/local/bin/*
# RUN sed -i 's/docker run/docker run --platform=linux\/amd64/g' /usr/local/bin/*
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
apache:
platform: linux/x86_64
build:
context: docker/
context: .
args:
- DOCKER_SCRATCH_DIR=${DOCKER_SCRATCH_DIR}
ports:
Expand Down

0 comments on commit 240d4f7

Please sign in to comment.