Skip to content
This repository was archived by the owner on Feb 1, 2024. It is now read-only.

Commit 9c529e9

Browse files
achimccAchim Schneider
authored andcommitted
ink-backend -> ink-compiler
1 parent cd987c2 commit 9c529e9

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/compiler_docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: diff ./compiler/Cargo.toml ./crates/contract/Cargo.toml
1717

1818
- name: Build docker
19-
run: docker build -f Dockerfile.compiler --tag ink-backend .
19+
run: docker build -f Dockerfile.compiler --tag ink-compiler .
2020

2121
- name: Login to DockerHub
2222
if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
@@ -27,8 +27,8 @@ jobs:
2727

2828
- name: Tag Docker image
2929
if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
30-
run: docker tag ink-backend:latest ${{ secrets.DOCKER_USER_NAME }}/ink-backend
30+
run: docker tag ink-compiler:latest ${{ secrets.DOCKER_USER_NAME }}/ink-compiler
3131

3232
- name: Push Docker image
3333
if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
34-
run: docker push ${{ secrets.DOCKER_USER_NAME }}/ink-backend
34+
run: docker push ${{ secrets.DOCKER_USER_NAME }}/ink-compiler

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
- name: Build
5656
run: cargo build --verbose
5757
- name: Pull docker image
58-
run: docker pull docker.io/achimcc/ink-backend:latest
58+
run: docker pull docker.io/achimcc/ink-compiler:latest
5959
- name: Tag docker image
60-
run: docker tag docker.io/achimcc/ink-backend:latest ink-backend
60+
run: docker tag docker.io/achimcc/ink-compiler:latest ink-compiler
6161
- name: Run tests
6262
run: cargo test --workspace --exclude rust_analyzer_wasm --verbose

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ To clone and build the whole project on your local computer, enter:
6363

6464
Then pull and tag the docker image which is used by the backend to compile, test & format Smart Contracts:
6565

66-
6. `docker pull achimcc/ink-backend`
66+
6. `docker pull achimcc/ink-compiler`
6767

68-
7. `docker tag achimcc/ink-backend ink-backend`
68+
7. `docker tag achimcc/ink-compiler ink-compiler`
6969

7070
Finally, start the backend with:
7171

@@ -183,12 +183,12 @@ Based on the jest testing framework, this packages executes some basic tests aga
183183

184184
## The Dockerfiles for ink! playground
185185

186-
We have two Dockerfiles for two different docker images in this repo: `ink-playground` and `ink-backend`:
186+
We have two Dockerfiles for two different docker images in this repo: `ink-playground` and `ink-compiler`:
187187

188-
- `ink-backend`
188+
- `ink-compiler`
189189
Is used to compile ink! Smart Contracts in a sandboxed environment. We execute the resulting image in a sandboxed environment without network access. The image is a derived from `docker.io/paritytech/ink-ci-linux:production` and ships with a pre-compiled ink! Smart Contract.
190190
- `ink-playground` \
191-
Is the main ink! Playground Dockerfile which is generated by the `./Dockerfile`. It is used to deploy the playground on our server. It is executed by using [Nestybox](https://www.nestybox.com/)'s [Sysbox](https://github.com/nestybox/sysbox) runtime. We require this runtime to compile ink! Smart Contracts through a sandboxed Docker in Docker execution within the executed Docker image by using the `ink-backend` Docker image.
191+
Is the main ink! Playground Dockerfile which is generated by the `./Dockerfile`. It is used to deploy the playground on our server. It is executed by using [Nestybox](https://www.nestybox.com/)'s [Sysbox](https://github.com/nestybox/sysbox) runtime. We require this runtime to compile ink! Smart Contracts through a sandboxed Docker in Docker execution within the executed Docker image by using the `ink-compiler` Docker image.
192192

193193
The Image is build in multiple steps by a [multi stage](https://docs.docker.com/develop/develop-images/multistage-build/) build process to improve its image size.
194194

crates/backend/src/services/contract.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub async fn route_format(
145145
}
146146

147147
pub async fn route_status() -> HttpResponse<BoxBody> {
148-
HttpResponse::Ok().body("ink-backend is live")
148+
HttpResponse::Ok().body("ink-compiler is live")
149149
}
150150

151151
// -------------------------------------------------------------------------------------------------

crates/sandbox/src/build_command.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use tokio::process::Command;
2727

2828
const DOCKER_PROCESS_TIMEOUT_SOFT: Duration = Duration::from_secs(20);
2929

30-
const DOCKER_CONTAINER_NAME: &str = "ink-backend";
30+
const DOCKER_CONTAINER_NAME: &str = "ink-compiler";
3131

3232
const DOCKER_WORKDIR: &str = "/builds/contract/";
3333

packages/docker-tests/__tests__/docker.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('Given the server is up and running', () => {
1010
test('When a request to the status route is made', async () => {
1111
await expect(axios.get(`${BACKEND_URL}/status`)).resolves.toMatchObject({
1212
status: 200,
13-
data: 'ink-backend is live',
13+
data: 'ink-compiler is live',
1414
});
1515
});
1616
});

sysbox/on-start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dockerd > /var/log/dockerd.log 2>&1 &
55
sleep 2
66

77
# pull inner images
8-
docker pull achimcc/ink-backend:latest
9-
docker tag achimcc/ink-backend ink-backend
8+
docker pull achimcc/ink-compiler:latest
9+
docker tag achimcc/ink-compiler ink-compiler
1010

1111
# start backend server
1212
/app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist

0 commit comments

Comments
 (0)