Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Ignored packages
packages/docs
packages/gas-profiler
packages/integration-test-utils
packages/test-rollup-workflow

# Ignored dirs
docker
db

10 changes: 1 addition & 9 deletions .github/workflows/dev-ecr-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1

- name: Install Dependencies
run: yarn install

- name: Build
run: |
yarn clean
yarn build

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
Expand All @@ -40,7 +32,7 @@ jobs:
ECR_REPOSITORY: optimism/rollup-microservices
IMAGE_TAG: latest
run: |
docker build -f Dockerfile.microservices -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
docker build -f Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG

- name: Stop existing dev-rollup-microservices ECS task to auto-start task with new image
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/synthetix-prod-ecr-deploy.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/synthetix-uat-ecr-deploy.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ npm-debug.log
/packages/docs/src/core/env/

# Local Dockerfiles
docker-compose.*.mine.yml
*.local.yml
*.mine.yml
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@ FROM node:11

WORKDIR /server
COPY . /server

RUN yarn
RUN yarn clean
RUN yarn build

# Copy live env config updates file to /server so that it may be updated while running.
COPY ./packages/rollup-core/config/env_var_updates.config /server

WORKDIR /server/packages/rollup-full-node
WORKDIR /server/packages/rollup-services

# This is required for the wait_for_postgres script
RUN apt-get update
RUN apt-get install -y postgresql-client

EXPOSE 8545
ENTRYPOINT [ "bash", "./exec/wait-for-nodes.sh", "yarn", "run", "server:fullnode:debug" ]
ENTRYPOINT [ "bash", "./exec/wait_for_postgres_and_geth.sh", "yarn", "run", "services" ]
10 changes: 8 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
FROM node:11
WORKDIR /mnt/full-node/packages/rollup-full-node

# Used to mount the code so image isn't re-built every time code changes
WORKDIR /mnt/monorepo/packages/rollup-services

# This is required for the wait_for_postgres script
RUN apt-get update
RUN apt-get install -y postgresql-client

EXPOSE 8545
CMD [ "bash", "./exec/wait-for-nodes.sh", "yarn", "run", "server:fullnode:debug" ]
ENTRYPOINT [ "bash", "./exec/build_and_run.sh", "yarn", "run", "services" ]
16 changes: 0 additions & 16 deletions Dockerfile.microservices

This file was deleted.

93 changes: 0 additions & 93 deletions aws/README.md

This file was deleted.

62 changes: 0 additions & 62 deletions aws/dev/full-node/docker-compose.yml

This file was deleted.

25 changes: 0 additions & 25 deletions aws/dev/full-node/ecs-params.yml

This file was deleted.

Loading