build(docker): update docker-compose to use main image

Author: michaelfig

docker/docker-compose.yml

@@ -1,26 +1,22 @@
 version: "2.2"
 services:
   ag-solo:
-    # NOTE: Use an environment variable like:
-    #   SDK_TAG=agoricdev-5.2
     # This tag needs to be the SDK used by the $NETCONFIG_URL
-    # Usually it's the same as the chain name
-    image: agoric/cosmic-swingset-solo:${SDK_TAG}
+    #  SDK_TAG=agoricdev-10
+    image: agoric/agoric-sdk:${SDK_TAG}
     # ISSUE: 127.0.0.1? not a docker network?
     ports:
       - "${HOST_PORT:-8000}:${PORT:-8000}"
     volumes:
-      - "ag-solo-state:/usr/src/app/solo"
-      - "ag-solo-state:/data/solo"
+      - "ag-solo-state:/state"
       - "$HOME/.agoric:/root/.agoric"
     environment:
-      - "AG_SOLO_BASEDIR=${SOLO_HOME:-agoric}"
+      - "AG_SOLO_BASEDIR=/state/${SOLO_HOME:-agoriclocal}"
+    entrypoint: ag-solo
     command:
       - setup
       - --webhost=0.0.0.0
       - --webport=${PORT:-8000}
-      # NOTE: Use an environment variable like:
-      #   NETCONFIG_URL=https://devnet.agoric.net/network-config
-      - --netconfig=${NETCONFIG_URL}
+      - --netconfig=${NETCONFIG_URL:-https://stage.agoric.net/network-config}
 volumes:
   ag-solo-state:

scripts/docker-tag.sh

@@ -15,8 +15,8 @@ for img in agoric-sdk cosmic-swingset-setup cosmic-swingset-solo deployment; do
   SRC="$DOCKERUSER/$img:$SRCTAG"
   DST="$DOCKERUSER/$img:$DSTTAG"
   if manifest=$(docker manifest inspect "$SRC"); then
-    SUBIMGS=$(jq -r .manifests[].digest <<<"$manifest" | sed -e "s!^!$DOCKERUSER/$img@!")
-    docker manifest create "$DST" $SUBIMGS
+    AMENDS=$(jq -r .manifests[].digest <<<"$manifest" | sed -e "s!^!--amend $DOCKERUSER/$img@!")
+    docker manifest create "$DST" $AMENDS
     docker manifest push "$DST"
   elif docker pull "$SRC"; then
     docker tag "$SRC" "$DST"