From 62f72e94556e093099c58eae6e2b0366f72d79c9 Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Wed, 18 Dec 2019 11:39:57 +0500 Subject: Docker environment added --- .dockerignore | 10 ++++++++++ .github/workflows/ci-build.yml | 15 +++++++++++++++ CHANGELOG.md | 4 ++++ Dockerfile | 29 +++++++++++++++++++++++++++++ README.md | 2 ++ 5 files changed, 60 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..57453172 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,10 @@ +.dockerignore +.git +.gitignore +.editorconfig +.idea +.github +/src +/tests +/bin +composer.json diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 3031cbb4..63b95c72 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -89,3 +89,18 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: + + image: + name: Build docker image + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v1 + with: + fetch-depth: 1 + + - name: Build image + run: docker build -t roadrunner -f Dockerfile . + + - name: Try to execute + run: docker run --rm roadrunner -v diff --git a/CHANGELOG.md b/CHANGELOG.md index 12924618..4de3aa8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +UNRELEASED +---------- +- added `Dockerfile` for building RR binary file + v1.5.2 (05.12.2019) ------------------- - added support for symfony/console 5.0 by @coxa diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..66d1e311 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +# Image page: +FROM golang:1.13-alpine as builder + +COPY . /src + +WORKDIR /src + +RUN set -x \ + && apk add --no-cache bash \ + && go version \ + && bash ./build.sh \ + && ./rr -v \ + && test -f ./.rr.yaml + +FROM alpine:latest + +LABEL \ + org.label-schema.name="roadrunner" \ + org.label-schema.description="High-performance PHP application server, load-balancer and process manager" \ + org.label-schema.url="https://github.com/spiral/roadrunner" \ + org.label-schema.vcs-url="https://github.com/spiral/roadrunner" \ + org.label-schema.vendor="SpiralScout" \ + org.label-schema.license="MIT" \ + org.label-schema.schema-version="1.0" + +COPY --from=builder /src/rr /usr/bin/rr +COPY --from=builder /src/.rr.yaml /etc/rr.yaml + +ENTRYPOINT ["/usr/bin/rr"] diff --git a/README.md b/README.md index 8cd4dfd6..8492ea74 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,8 @@ $ composer require spiral/roadrunner $ ./vendor/bin/rr get-binary ``` +> For getting roadrunner binary file you can use our docker image: `spiral/roadrunner:latest` (more info can be found [here](https://hub.docker.com/r/spiral/roadrunner/)) + Example: -------- -- cgit v1.2.3 From b69fdf6627a9599579cc9014383d8c546c5d5965 Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Wed, 18 Dec 2019 12:09:34 +0500 Subject: Readme file updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8492ea74..00884782 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ $ composer require spiral/roadrunner $ ./vendor/bin/rr get-binary ``` -> For getting roadrunner binary file you can use our docker image: `spiral/roadrunner:latest` (more info can be found [here](https://hub.docker.com/r/spiral/roadrunner/)) +> For getting roadrunner binary file you can use our docker image: `spiral/roadrunner:X.X.X` (more information about image and tags can be found [here](https://hub.docker.com/r/spiral/roadrunner/)) Example: -------- -- cgit v1.2.3 From 851c31ec93c047bdf7504dacc51953527042c8bc Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Wed, 18 Dec 2019 12:11:44 +0500 Subject: Changelog updated --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4de3aa8b..c5c4911b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ CHANGELOG UNRELEASED ---------- -- added `Dockerfile` for building RR binary file +- added `Dockerfile` for building RR binary file by [@tarampampam](https://github.com/tarampampam) (closes [issue #218](https://github.com/spiral/roadrunner/issues/218)) v1.5.2 (05.12.2019) ------------------- -- cgit v1.2.3 From b75bd95f9d56cf28780dbde7cc10e3698be54fe7 Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Wed, 18 Dec 2019 12:28:09 +0500 Subject: golang version updated in dockerfile (1.13 -> 1.12) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66d1e311..84170111 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Image page: -FROM golang:1.13-alpine as builder +FROM golang:1.12-alpine as builder COPY . /src -- cgit v1.2.3 From 3f7d8bc007a4efdd48bb16253c2686006f0f9cda Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Wed, 18 Dec 2019 12:31:36 +0500 Subject: Git installing added into dockerfile (for golang 1.13 this actions was not required) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84170111..4ea56dc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY . /src WORKDIR /src RUN set -x \ - && apk add --no-cache bash \ + && apk add --no-cache bash git \ && go version \ && bash ./build.sh \ && ./rr -v \ -- cgit v1.2.3 From f2f5ca19975315c1c9345798eeeb15ceb839836f Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Tue, 24 Dec 2019 19:00:12 +0500 Subject: Update ci-build.yml --- .github/workflows/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 63b95c72..360c4f30 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -95,12 +95,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: fetch-depth: 1 - name: Build image - run: docker build -t roadrunner -f Dockerfile . + run: docker build -t rr:local -f Dockerfile . - name: Try to execute - run: docker run --rm roadrunner -v + run: docker run --rm rr:local -v -- cgit v1.2.3 From 3506812078eea46b795dd0edd96df9f4586026df Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Tue, 24 Dec 2019 19:06:25 +0500 Subject: Update .dockerignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 57453172..9bfb38f4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ .git .gitignore .editorconfig -.idea .github /src /tests -- cgit v1.2.3