Sfoglia il codice sorgente

move to ghcr.io away from docker hub (final part)

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 4 anni fa
parent
commit
f36ceeedaa
6 ha cambiato i file con 25 aggiunte e 25 eliminazioni
  1. 3 3
      .github/workflows/release.yml
  2. 4 4
      .github/workflows/test.yml
  3. 1 1
      Dockerfile
  4. 3 3
      README.md
  5. 4 4
      docs/installing.rst
  6. 10 10
      docs/running.rst

+ 3 - 3
.github/workflows/release.yml

@@ -165,8 +165,8 @@ jobs:
         asset_name: solang-mac-intel
         tag: ${{ github.ref }}
 
-  docker:
-    name: Docker
+  container:
+    name: Container
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout sources
@@ -174,4 +174,4 @@ jobs:
     - run: docker build . -t ghcr.io/hyperledger-labs/solang:${GITHUB_REF/refs\/tags\//}
     - run: |
         echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-        docker push ghcr.io/hyperledgerlabs/solang:${GITHUB_REF/refs\/tags\//}
+        docker push ghcr.io/hyperledger-labs/solang:${GITHUB_REF/refs\/tags\//}

+ 4 - 4
.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
   lints:
     name: Lints
     runs-on: ubuntu-20.04
-    container: hyperledgerlabs/solang:ci
+    container: ghcr.io/hyperledger-labs/solang:ci
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
   linux:
     name: Linux
     runs-on: ubuntu-20.04
-    container: hyperledgerlabs/solang:ci
+    container: ghcr.io/hyperledger-labs/solang:ci
     steps:
     - name: Checkout sources
       # Make sure "git describe --tags" works for solang --version
@@ -122,8 +122,8 @@ jobs:
         name: solang-mac-intel
         path: ./target/debug/solang
 
-  docker:
-    name: Docker
+  container:
+    name: Container
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout sources

+ 1 - 1
Dockerfile

@@ -6,7 +6,7 @@
 # Ubuntu 18.04 produces a builder image 1.53 GiB and solang image of 84 MiB
 # Debian Buster produces a builder image 2.04 GiB
 
-FROM hyperledgerlabs/solang:ci as builder
+FROM ghcr.io/hyperledger-labs/solang:ci as builder
 
 COPY . src
 WORKDIR /src/stdlib/

+ 3 - 3
README.md

@@ -17,7 +17,7 @@ Solang is under active development right now, and has
 ## Simple example
 
 First build [Solang](https://solang.readthedocs.io/en/latest/installing.html)
-or use the docker image, then write the following to flipper.sol:
+or use the container, then write the following to flipper.sol:
 
 ```solidity
 contract flipper {
@@ -43,10 +43,10 @@ Now run:
 solang --target substrate flipper.sol
 ```
 
-Alternatively if you want to use the solang docker image, run:
+Alternatively if you want to use the solang container, run:
 
 ```
-docker run --rm -it -v $(pwd):/sources hyperledgerlabs/solang -v -o /sources --target substrate /sources/flipper.sol
+docker run --rm -it -v $(pwd):/sources ghcr.io/hyperledger-labs/solang -v -o /sources --target substrate /sources/flipper.sol
 ```
 You will have a file called flipper.contract. You can use this directly in
 the [Polkadot UI](https://substrate.dev/substrate-contracts-workshop/#/0/deploy-contract),

+ 4 - 4
docs/installing.rst

@@ -21,16 +21,16 @@ Remember to remove the quarantine attribute using ``xattr -d com.apple.quarantin
 
 `<https://github.com/hyperledger-labs/solang/releases/download/v0.1.8/solang-mac-intel>`_
 
-Using hyperledgerlabs/solang docker hub images
-----------------------------------------------
+Using ghcr.io/hyperledger-labs/solang containers
+------------------------------------------------
 
 New images are automatically made available on
-`docker hub <https://hub.docker.com/repository/docker/hyperledgerlabs/solang/>`_.
+`solang containers <https://github.com/hyperledger-labs/solang/pkgs/container/solang>`_.
 There is a release `v0.1.8` tag and a `latest` tag:
 
 .. code-block:: bash
 
-	docker pull hyperledgerlabs/solang:latest
+	docker pull ghcr.io/hyperledger-labs/solang:latest
 
 The Solang binary is stored at ``/usr/bin/solang`` in this image. The `latest` tag
 gets updated each time there is a commit to the main branch of the Solang git repository.

+ 10 - 10
docs/running.rst

@@ -111,33 +111,33 @@ Options:
    Disable the :ref:`vector-to-slice` optimization
 
 
-Running Solang from docker image
-________________________________
+Running Solang using container
+______________________________
 
-First pull the last Solang image from
-`docker hub <https://hub.docker.com/repository/docker/hyperledgerlabs/solang/>`_:
+First pull the last Solang container from
+`solang containers <https://github.com/hyperledger-labs/solang/pkgs/container/solang>`_:
 
 .. code-block:: bash
 
-    docker pull hyperledgerlabs/solang
+    docker pull ghcr.io/hyperledger-labs/solang
 
 And if you are using podman:
 
 .. code-block:: bash
 
-    podman image pull hyperlederlabs/solang
+    podman image pull ghcr.io/hyperledger-labs/solang
 
 Now you can run Solang like so:
 
 .. code-block:: bash
 
-	  docker run --rm -it hyperledgerlabs/solang --version
+	  docker run --rm -it ghcr.io/hyperledger-labs/solang --version
 
 Or podman:
 
 .. code-block:: bash
 
-	  podman container run --rm -it hyperledgerlabs/solang --version
+	  podman container run --rm -it ghcr.io/hyperledger-labs/solang --version
 
 If you want to compile some solidity files, the source file needs to be
 available inside the container. You can do this via the -v command line.
@@ -146,10 +146,10 @@ to your solidity files:
 
 .. code-block:: bash
 
-	  docker run --rm -it -v /local/path:/sources hyperledgerlabs/solang -o /sources /sources/flipper.sol
+	  docker run --rm -it -v /local/path:/sources ghcr.io/hyperledger-labs/solang -o /sources /sources/flipper.sol
 
 On Windows, you need to specify absolute paths:
 
 .. code-block:: text
 
-	docker run --rm -it -v C:\Users\User:/sources hyperledgerlabs/solang -o /sources /sources/flipper.sol
+	docker run --rm -it -v C:\Users\User:/sources ghcr.io/hyperledger-labs/solang -o /sources /sources/flipper.sol