Skip to content

Commit

Permalink
Change image name of image-toolchain and image-rootfs
Browse files Browse the repository at this point in the history
  • Loading branch information
tuler committed Dec 9, 2019
1 parent 10038b0 commit 5e5ef7e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: Publish to DockerHub
if: startsWith(github.ref, 'refs/tags/v')
run: |
docker tag cartesi/image-rootfs:devel cartesi/image-rootfs:${GITHUB_REF:11}
docker tag cartesi/rootfs:devel cartesi/rootfs:${GITHUB_REF:11}
echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
docker push cartesi/image-rootfs:${GITHUB_REF:11}
docker push cartesi/rootfs:${GITHUB_REF:11}
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#

ARG TOOLCHAIN_VERSION=latest
FROM cartesi/image-toolchain:${TOOLCHAIN_VERSION}
FROM cartesi/toolchain:${TOOLCHAIN_VERSION}

LABEL maintainer="Diego Nehab <[email protected]>"

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
.PHONY: build push run share

TAG ?= devel
TOOLCHAIN_TAG ?=
TOOLCHAIN_TAG ?= 0.1.0
NEW_TAG ?= latest

CONTAINER_BASE := /opt/cartesi/image-rootfs
CONTAINER_BASE := /opt/cartesi/rootfs

IMG_REPO:=cartesi/image-rootfs
IMG_REPO:=cartesi/rootfs
IMG:=$(IMG_REPO):$(TAG)
BASE:=/opt/riscv
ART:=$(BASE)/rootfs.ext2
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Cartesi Machine Image RootFS

The Cartesi Image RootFS is the repository that provides the Docker configuration files to build the `rootfs.ext2` testing filesystem. This is used to run a Linux environment on the Cartesi Machine Emulator reference implementation. The current image is based on the `cartesi/image-toolchain` that uses Ubuntu 18.04 and GNU GCC 8.3.0. The `rootfs.ext2` is built with Buildroot 2019.05.1 targeting the RISC-V RV64IMA with ABI LP64 architecture.
The Cartesi Image RootFS is the repository that provides the Docker configuration files to build the `rootfs.ext2` testing filesystem. This is used to run a Linux environment on the Cartesi Machine Emulator reference implementation. The current image is based on the `cartesi/toolchain` that uses Ubuntu 18.04 and GNU GCC 8.3.0. The `rootfs.ext2` is built with Buildroot 2019.05.1 targeting the RISC-V RV64IMA with ABI LP64 architecture.

## Getting Started

Expand All @@ -29,8 +29,8 @@ To remove the generated images from your system, please refer to the Docker docu

The following options are available as `make` targets:

- **build**: builds the docker image-rootfs image
- **copy**: builds the imgae-rootfs image and copy it's artifact to the host
- **build**: builds the docker rootfs image
- **copy**: builds the rootfs image and copy it's artifact to the host
- **run**: runs the generated image with current user UID and GID
- **run-as-root**: runs the generated image as root
- **push**: pushes the image to the registry repository
Expand All @@ -40,7 +40,7 @@ The following options are available as `make` targets:
You can pass the following variables to the make target if you wish to use different docker image tags.

- TAG: image-roofs image tag
- TOOLCHAIN\_TAG: image-toolchain image tag
- TOOLCHAIN\_TAG: toolchain image tag

```
$ make build TAG=mytag
Expand All @@ -65,10 +65,10 @@ $ make run

## Contributing

Thank you for your interest in Cartesi! Head over to our [Contributing Guidelines](https://github.com/cartesi/image-rootfs/blob/master/CONTRIBUTING.md) for instructions on how to sign our Contributors Agreement and get started with
Thank you for your interest in Cartesi! Head over to our [Contributing Guidelines](CONTRIBUTING.md) for instructions on how to sign our Contributors Agreement and get started with
Cartesi!

Please note we have a [Code of Conduct](https://github.com/cartesi/image-rootfs/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
Please note we have a [Code of Conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.

## Authors

Expand All @@ -78,5 +78,5 @@ Please note we have a [Code of Conduct](https://github.com/cartesi/image-rootfs/
## License

The image-rootfs repository and all contributions are licensed under
[APACHE 2.0](https://www.apache.org/licenses/LICENSE-2.0). Please review our [LICENSE](https://github.com/cartesi/image-rootfs/blob/master/LICENSE) file.
[APACHE 2.0](https://www.apache.org/licenses/LICENSE-2.0). Please review our [LICENSE](LICENSE) file.

0 comments on commit 5e5ef7e

Please sign in to comment.