fix: cleaning up docker

wileyj · wileyj · commit e2037646cc30 · 2021-08-10T18:14:42.000-04:00
#588 Moving most docker related items to a dedicated folder.
diff --git a/.github/workflows/stacks-blockchain-api.yml b/.github/workflows/stacks-blockchain-api.yml
@@ -235,7 +235,7 @@ jobs:
       - name: Build/Tag/Push standalone Image
         uses: docker/build-push-action@v1
         with:
-          dockerfile: follower.Dockerfile
+          dockerfile: docker/stx-rosetta.Dockerfile
           repository: blockstack/${{ github.workflow }}-standalone
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -1,4 +1,4 @@
-FROM blockstack/stacks-blockchain:2.0.5-stretch as corenode
+FROM blockstack/stacks-blockchain:latest-stretch as corenode
 
 FROM gitpod/workspace-postgres
 
diff --git a/README-rosetta.md b/README-rosetta.md
@@ -1,8 +1,8 @@
 # Testing the Rosetta APIs
 
-Build and run the `stx-rosetta.Dockerfile` image:
+Build and run the `docker/stx-rosetta.Dockerfile` image:
 
-    docker build -t stx-rosetta:stable -f stx-rosetta.Dockerfile .
+    docker build -t stx-rosetta:stable -f docker/stx-rosetta.Dockerfile .
     docker run -d -p 3999:3999 --mount source=rosetta-data,target=/data \
         --name stx-rosetta stx-rosetta:stable
 
diff --git a/docker/docker-compose.dev.bitcoind.yml b/docker/docker-compose.dev.bitcoind.yml
@@ -1,11 +1,12 @@
-version: '3.7'
+version: "3"
 services:
   bitcoind:
-    image: "ruimarinho/bitcoin-core:0.19.1-alpine"
+    image: "blockstack/bitcoind:v0.20.99.0"
     ports:
       - "18443:18443"
       - "18444:18444"
     command: 
+      /usr/local/bin/bitcoind
       -printtoconsole
       -regtest=1
       -txindex=1
diff --git a/docker/docker-compose.dev.postgres.yml b/docker/docker-compose.dev.postgres.yml
@@ -1,7 +1,7 @@
-version: '3.7'
+version: "3"
 services:
   postgres:
-    image: "postgres:12.2"
+    image: "postgres:alpine"
     ports:
       - "5490:5432"
     environment:
diff --git a/docker/docker-compose.dev.rosetta-construction.yml b/docker/docker-compose.dev.rosetta-construction.yml
@@ -1,7 +1,7 @@
-version: '3.7'
+version: "3"
 services:
   rosetta-cli:
     build:
-      context: ./rosetta-cli-config
+      context: ../rosetta-cli-config
       dockerfile: docker/Dockerfile
     command: /bin/rosetta-cli --configuration-file /app/rosetta-config-docker.json check:construction
diff --git a/docker/docker-compose.dev.stacks-blockchain-follower.yml b/docker/docker-compose.dev.stacks-blockchain-follower.yml
@@ -1,8 +1,8 @@
-version: '3.7'
+version: "3"
 services:
   stacks-blockchain:
     build:
-      context: ./stacks-blockchain/docker
+      context: ../stacks-blockchain/docker
     command: stacks-node start --config=/app/config/Stacks-follower.toml
     restart: on-failure
     environment:
@@ -12,5 +12,5 @@ services:
       - "20443:20443"
       - "20444:20444"
     volumes:
-      - ./stacks-blockchain/:/app/config
-      - ./stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
+      - ../stacks-blockchain/:/app/config
+      - ../stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
diff --git a/docker/docker-compose.dev.stacks-blockchain.yml b/docker/docker-compose.dev.stacks-blockchain.yml
@@ -1,8 +1,8 @@
-version: '3.7'
+version: "3"
 services:
   stacks-blockchain:
     build:
-      context: ./stacks-blockchain/docker
+      context: ../stacks-blockchain/docker
     command: stacks-node start --config=/app/config/Stacks-dev.toml
     restart: on-failure
     environment:
@@ -13,5 +13,5 @@ services:
       - "20443:20443"
       - "20444:20444"
     volumes:
-      - ./stacks-blockchain/:/app/config
-      - ./stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
+      - ../stacks-blockchain/:/app/config
+      - ../stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: "3"
 services:
   stacks-blockchain:
     command: stacks-node start --config=/app/config/Stacks-mocknet.toml
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
-version: '3.7'
+version: "3"
 services:
   postgres:
-    image: "postgres:12.2"
+    image: "postgres:alpine"
     ports:
       - "5490:5432"
     environment:
@@ -13,7 +13,7 @@ services:
       - backend
   stacks-blockchain:
     build:
-      context: ./stacks-blockchain/docker
+      context: ../stacks-blockchain/docker
     command: stacks-node start --config=/app/config/Stacks-follower.toml
     restart: on-failure
     environment:
@@ -24,8 +24,8 @@ services:
       - "20443:20443"
       - "20444:20444"
     volumes:
-      - ./stacks-blockchain/:/app/config
-      - ./stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
+      - ../stacks-blockchain/:/app/config
+      - ../stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
     networks:
       - backend
   stacks-blockchain-api:
@@ -50,7 +50,7 @@ services:
       - "3999:3999"
       - "9153:9153"
     volumes:
-      - ./stacks-blockchain/:/app/config
+      - ../stacks-blockchain/:/app/config
     networks:
       - backend
     depends_on: 
diff --git a/docker/stx-rosetta.Dockerfile b/docker/stx-rosetta.Dockerfile
@@ -1,5 +1,5 @@
-ARG STACKS_API_VERSION=v0.56.0
-ARG STACKS_NODE_VERSION=2.0.11.0.0
+ARG STACKS_API_VERSION=v0.62.3
+ARG STACKS_NODE_VERSION=2.0.11.2.0
 ARG STACKS_API_REPO=blockstack/stacks-blockchain-api
 ARG STACKS_NODE_REPO=blockstack/stacks-blockchain
 ARG PG_VERSION=12
diff --git a/follower.Dockerfile b/follower.Dockerfile
diff --git a/package.json b/package.json
@@ -21,11 +21,11 @@
     "lint:prettier": "prettier --check src/**/*.{ts,json}",
     "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx -f codeframe --fix && prettier --write --check src/**/*.{ts,json}",
     "migrate": "node-pg-migrate -m src/migrations",
-    "devenv:build": "docker-compose -f docker-compose.dev.postgres.yml -f docker-compose.dev.stacks-blockchain.yml -f docker-compose.dev.bitcoind.yml build --no-cache",
-    "devenv:deploy": "docker-compose -f docker-compose.dev.postgres.yml -f docker-compose.dev.stacks-blockchain.yml -f docker-compose.dev.bitcoind.yml up",
-    "devenv:follower": "docker-compose -f docker-compose.dev.postgres.yml -f docker-compose.dev.stacks-blockchain-follower.yml up",
-    "devenv:stop": "docker-compose -f docker-compose.dev.postgres.yml -f docker-compose.dev.stacks-blockchain.yml -f docker-compose.dev.bitcoind.yml down -v -t 0",
-    "devenv:logs": "docker-compose -f docker-compose.dev.postgres.yml -f docker-compose.dev.stacks-blockchain.yml -f docker-compose.dev.bitcoind.yml logs -t -f"
+    "devenv:build": "docker-compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml build --no-cache",
+    "devenv:deploy": "docker-compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml up",
+    "devenv:follower": "docker-compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain-follower.yml up",
+    "devenv:stop": "docker-compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml down -v -t 0",
+    "devenv:logs": "docker-compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml logs -t -f"
   },
   "repository": {
     "type": "git",
diff --git a/src/tests-rosetta-cli/validate-rosetta-construction.ts b/src/tests-rosetta-cli/validate-rosetta-construction.ts
@@ -132,13 +132,13 @@ describe('Rosetta API', () => {
     await compose.buildOne('rosetta-cli', {
       cwd: path.join(__dirname, '../../'),
       log: true,
-      composeOptions: ['-f', 'docker-compose.dev.rosetta-construction.yml'],
+      composeOptions: ['-f', 'docker/docker-compose.dev.rosetta-construction.yml'],
     });
     // start cli container
     void compose.upOne('rosetta-cli', {
       cwd: path.join(__dirname, '../../'),
       log: true,
-      composeOptions: ['-f', 'docker-compose.dev.rosetta-construction.yml'],
+      composeOptions: ['-f', 'docker/docker-compose.dev.rosetta-construction.yml'],
       commandOptions: ['--abort-on-container-exit'],
     });
 
diff --git a/src/tests-rosetta-cli/validate-rosetta.ts b/src/tests-rosetta-cli/validate-rosetta.ts
@@ -135,13 +135,13 @@ describe('Rosetta API', () => {
     await compose.buildOne('rosetta-cli', {
       cwd: path.join(__dirname, '../../'),
       log: true,
-      composeOptions: ['-f', 'docker-compose.dev.rosetta-cli.yml'],
+      composeOptions: ['-f', 'docker/docker-compose.dev.rosetta-cli.yml'],
     });
     // start cli container
     void compose.upOne('rosetta-cli', {
       cwd: path.join(__dirname, '../../'),
       log: true,
-      composeOptions: ['-f', 'docker-compose.dev.rosetta-cli.yml'],
+      composeOptions: ['-f', 'docker/docker-compose.dev.rosetta-cli.yml'],
       commandOptions: ['--abort-on-container-exit'],
     });
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM blockstack/stacks-blockchain:2.0.5-stretch as corenode`
	`1`	`+FROM blockstack/stacks-blockchain:latest-stretch as corenode`
`2`	`2`
`3`	`3`	`FROM gitpod/workspace-postgres`
`4`	`4`