Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from openc3 to openc3inc docker namespace #32

Merged
merged 1 commit into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@ jobs:
- uses: anchore/scan-action/download-grype@v3
id: grype
- name: Run grype on the image ruby
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-ruby:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-ruby:latest
- name: Run grype on the image node
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-node:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-node:latest
- name: Run grype on the image base
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-base:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-base:latest
- name: Run grype on the image init
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-init:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-init:latest
- name: Run grype on the image redis
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-redis:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-redis:latest
- name: Run grype on the image minio
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-minio:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-minio:latest
- name: Run grype on the image operator
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-operator:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-operator:latest
- name: Run grype on the image cmd-tlm-api
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-cmd-tlm-api:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-cmd-tlm-api:latest
- name: Run grype on the image script-runner-api
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-script-runner-api:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-script-runner-api:latest
- name: Run grype on the image traefik
run: ${{steps.grype.outputs.cmd}} docker.io/openc3/openc3-traefik:latest
run: ${{steps.grype.outputs.cmd}} docker.io/openc3inc/openc3-traefik:latest
13 changes: 10 additions & 3 deletions compose-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
APK_URL: ${APK_URL}
RUBYGEMS_URL: ${RUBYGEMS_URL}
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
image: "${OPENC3_REGISTRY}/openc3/openc3-ruby:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-ruby:${OPENC3_TAG}"

openc3-node:
build:
Expand All @@ -39,7 +39,7 @@ services:
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3/openc3-node:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-node:${OPENC3_TAG}"
depends_on:
- "openc3-ruby"

Expand All @@ -50,7 +50,7 @@ services:
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3/openc3-base:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-base:${OPENC3_TAG}"
depends_on:
- "openc3-ruby"

Expand All @@ -60,13 +60,15 @@ services:
network: host
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-minio:${OPENC3_TAG}"

openc3-redis:
build:
context: "openc3-redis"
network: host
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-redis:${OPENC3_TAG}"

openc3-cmd-tlm-api:
build:
Expand All @@ -75,6 +77,7 @@ services:
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-cmd-tlm-api:${OPENC3_TAG}"
depends_on:
- "openc3-base"

Expand All @@ -85,6 +88,7 @@ services:
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-script-runner-api:${OPENC3_TAG}"
depends_on:
- "openc3-base"

Expand All @@ -95,6 +99,7 @@ services:
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-operator:${OPENC3_TAG}"
depends_on:
- "openc3-base"

Expand All @@ -104,6 +109,7 @@ services:
network: host
args:
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-traefik:${OPENC3_TAG}"

openc3-init:
build:
Expand All @@ -113,6 +119,7 @@ services:
NPM_URL: ${NPM_URL}
OPENC3_REGISTRY: ${OPENC3_REGISTRY}
OPENC3_TAG: ${OPENC3_TAG}
image: "${OPENC3_REGISTRY}/openc3inc/openc3-init:${OPENC3_TAG}"
depends_on:
- "openc3-node"
- "openc3-base"
16 changes: 8 additions & 8 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ version: "3.5"

services:
openc3-minio:
image: "${OPENC3_REGISTRY}/openc3/openc3-minio:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-minio:${OPENC3_TAG}"
volumes:
- "openc3-minio-v:/data"
- "./cacert.pem:/devel/cacert.pem"
Expand All @@ -36,7 +36,7 @@ services:
NODE_EXTRA_CA_CERTS: "/devel/cacert.pem"

openc3-redis:
image: "${OPENC3_REGISTRY}/openc3/openc3-redis:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-redis:${OPENC3_TAG}"
volumes:
- "openc3-redis-v:/data"
- "./cacert.pem:/devel/cacert.pem"
Expand All @@ -49,7 +49,7 @@ services:
NODE_EXTRA_CA_CERTS: "/devel/cacert.pem"

openc3-redis-ephemeral:
image: "${OPENC3_REGISTRY}/openc3/openc3-redis:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-redis:${OPENC3_TAG}"
volumes:
- "./cacert.pem:/devel/cacert.pem"
- "./openc3-redis/users.acl:/config/users.acl"
Expand All @@ -62,7 +62,7 @@ services:
NODE_EXTRA_CA_CERTS: "/devel/cacert.pem"

openc3-cmd-tlm-api:
image: "${OPENC3_REGISTRY}/openc3/openc3-cmd-tlm-api:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-cmd-tlm-api:${OPENC3_TAG}"
restart: "unless-stopped"
depends_on:
- "openc3-redis"
Expand All @@ -78,7 +78,7 @@ services:
- ".env"

openc3-script-runner-api:
image: "${OPENC3_REGISTRY}/openc3/openc3-script-runner-api:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-script-runner-api:${OPENC3_TAG}"
restart: "unless-stopped"
depends_on:
- "openc3-redis"
Expand All @@ -94,7 +94,7 @@ services:
- ".env"

openc3-operator:
image: "${OPENC3_REGISTRY}/openc3/openc3-operator:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-operator:${OPENC3_TAG}"
restart: "unless-stopped"
depends_on:
- "openc3-redis"
Expand All @@ -113,7 +113,7 @@ services:
- host.docker.internal:host-gateway

openc3-traefik:
image: "${OPENC3_REGISTRY}/openc3/openc3-traefik:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-traefik:${OPENC3_TAG}"
volumes:
- "./cacert.pem:/devel/cacert.pem"
- "./openc3-traefik/traefik.yaml:/etc/traefik/traefik.yaml"
Expand All @@ -139,7 +139,7 @@ services:
NODE_EXTRA_CA_CERTS: "/devel/cacert.pem"

openc3-init:
image: "${OPENC3_REGISTRY}/openc3/openc3-init:${OPENC3_TAG}"
image: "${OPENC3_REGISTRY}/openc3inc/openc3-init:${OPENC3_TAG}"
restart: on-failure
depends_on:
- "openc3-traefik"
Expand Down
2 changes: 1 addition & 1 deletion openc3-cmd-tlm-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/openc3/openc3-base:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-base:${OPENC3_TAG}

WORKDIR /src/
COPY Gemfile ./
Expand Down
4 changes: 2 additions & 2 deletions openc3-init/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/minio/mc:RELEASE.2021-12-10T00-14-28Z AS minio-mc
FROM ${OPENC3_REGISTRY}/openc3/openc3-node:${OPENC3_TAG} AS openc3-frontend-tmp
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-node:${OPENC3_TAG} AS openc3-frontend-tmp

WORKDIR /openc3/plugins/

Expand Down Expand Up @@ -106,7 +106,7 @@ COPY --from=openc3-tmp2 /openc3/plugins/gems/* /openc3/plugins/gems/
COPY --from=openc3-tmp3 /openc3/plugins/gems/* /openc3/plugins/gems/
COPY --from=openc3-tmp4 /openc3/plugins/gems/* /openc3/plugins/gems/

FROM ${OPENC3_REGISTRY}/openc3/openc3-base:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-base:${OPENC3_TAG}

COPY --from=openc3-frontend-base-tmp --chown=${IMAGE_USER}:${IMAGE_GROUP} /openc3/plugins/gems/* /openc3/plugins/gems/
COPY --from=openc3-frontend-base-tmp --chown=${IMAGE_USER}:${IMAGE_GROUP} /openc3/plugins/yarn.lock /openc3/plugins/yarn.lock
Expand Down
2 changes: 1 addition & 1 deletion openc3-node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/openc3/openc3-ruby:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-ruby:${OPENC3_TAG}

USER root

Expand Down
2 changes: 1 addition & 1 deletion openc3-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/openc3/openc3-base:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-base:${OPENC3_TAG}

WORKDIR /openc3/lib/openc3/operators/

Expand Down
2 changes: 1 addition & 1 deletion openc3-script-runner-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/openc3/openc3-base:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-base:${OPENC3_TAG}

WORKDIR /src/
COPY Gemfile ./
Expand Down
2 changes: 1 addition & 1 deletion openc3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OPENC3_REGISTRY=docker.io
ARG OPENC3_TAG=latest

FROM ${OPENC3_REGISTRY}/openc3/openc3-ruby:${OPENC3_TAG}
FROM ${OPENC3_REGISTRY}/openc3inc/openc3-ruby:${OPENC3_TAG}

WORKDIR /openc3/

Expand Down
36 changes: 18 additions & 18 deletions scripts/linux/openc3_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ if [ "$#" -ne 1 ]; then
fi

# Tag and push all the images to the local repository
docker tag openc3/openc3-ruby ${1}/openc3-ruby:latest
docker tag openc3/openc3-node ${1}/openc3-node:latest
docker tag openc3/openc3-base ${1}/openc3-base:latest
docker tag openc3/openc3-cmd-tlm-api ${1}/openc3-cmd-tlm-api:latest
docker tag openc3/openc3-script-runner-api ${1}/openc3-script-runner-api:latest
docker tag openc3/openc3-operator ${1}/openc3-operator:latest
docker tag openc3/openc3-init ${1}/openc3-init:latest
docker tag openc3/openc3-redis ${1}/openc3-redis:latest
docker tag openc3/openc3-minio ${1}/openc3-minio:latest
docker tag openc3inc/openc3-ruby ${1}/openc3inc/openc3-ruby:latest
docker tag openc3inc/openc3-node ${1}/openc3inc/openc3-node:latest
docker tag openc3inc/openc3-base ${1}/openc3inc/openc3-base:latest
docker tag openc3inc/openc3-cmd-tlm-api ${1}/openc3inc/openc3-cmd-tlm-api:latest
docker tag openc3inc/openc3-script-runner-api ${1}/openc3inc/openc3-script-runner-api:latest
docker tag openc3inc/openc3-operator ${1}/openc3inc/openc3-operator:latest
docker tag openc3inc/openc3-init ${1}/openc3inc/openc3-init:latest
docker tag openc3inc/openc3-redis ${1}/openc3inc/openc3-redis:latest
docker tag openc3inc/openc3-minio ${1}/openc3inc/openc3-minio:latest

docker push ${1}/openc3-ruby:latest
docker push ${1}/openc3-node:latest
docker push ${1}/openc3-base:latest
docker push ${1}/openc3-cmd-tlm-api:latest
docker push ${1}/openc3-script-runner-api:latest
docker push ${1}/openc3-operator:latest
docker push ${1}/openc3-init:latest
docker push ${1}/openc3-redis:latest
docker push ${1}/openc3-minio:latest
docker push ${1}/openc3inc/openc3-ruby:latest
docker push ${1}/openc3inc/openc3-node:latest
docker push ${1}/openc3inc/openc3-base:latest
docker push ${1}/openc3inc/openc3-cmd-tlm-api:latest
docker push ${1}/openc3inc/openc3-script-runner-api:latest
docker push ${1}/openc3inc/openc3-operator:latest
docker push ${1}/openc3inc/openc3-init:latest
docker push ${1}/openc3inc/openc3-redis:latest
docker push ${1}/openc3inc/openc3-minio:latest
40 changes: 20 additions & 20 deletions scripts/linux/openc3_util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ saveTar() {
tag='latest'
else
tag=$1
docker pull openc3/openc3-ruby:$tag
docker pull openc3/openc3-base:$tag
docker pull openc3/openc3-node:$tag
docker pull openc3/openc3-operator:$tag
docker pull openc3/openc3-cmd-tlm-api:$tag
docker pull openc3/openc3-script-runner-api:$tag
docker pull openc3/openc3-traefik:$tag
docker pull openc3/openc3-redis:$tag
docker pull openc3/openc3-minio:$tag
docker pull openc3/openc3-init:$tag
docker pull openc3inc/openc3-ruby:$tag
docker pull openc3inc/openc3-base:$tag
docker pull openc3inc/openc3-node:$tag
docker pull openc3inc/openc3-operator:$tag
docker pull openc3inc/openc3-cmd-tlm-api:$tag
docker pull openc3inc/openc3-script-runner-api:$tag
docker pull openc3inc/openc3-traefik:$tag
docker pull openc3inc/openc3-redis:$tag
docker pull openc3inc/openc3-minio:$tag
docker pull openc3inc/openc3-init:$tag
fi
docker save openc3/openc3-ruby:$tag -o tmp/openc3-ruby-$tag.tar
docker save openc3/openc3-base:$tag -o tmp/openc3-base-$tag.tar
docker save openc3/openc3-node:$tag -o tmp/openc3-node-$tag.tar
docker save openc3/openc3-operator:$tag -o tmp/openc3-operator-$tag.tar
docker save openc3/openc3-cmd-tlm-api:$tag -o tmp/openc3-cmd-tlm-api-$tag.tar
docker save openc3/openc3-script-runner-api:$tag -o tmp/openc3-script-runner-api-$tag.tar
docker save openc3/openc3-traefik:$tag -o tmp/openc3-traefik-$tag.tar
docker save openc3/openc3-redis:$tag -o tmp/openc3-redis-$tag.tar
docker save openc3/openc3-minio:$tag -o tmp/openc3-minio-$tag.tar
docker save openc3/openc3-init:$tag -o tmp/openc3-init-$tag.tar
docker save openc3inc/openc3-ruby:$tag -o tmp/openc3-ruby-$tag.tar
docker save openc3inc/openc3-base:$tag -o tmp/openc3-base-$tag.tar
docker save openc3inc/openc3-node:$tag -o tmp/openc3-node-$tag.tar
docker save openc3inc/openc3-operator:$tag -o tmp/openc3-operator-$tag.tar
docker save openc3inc/openc3-cmd-tlm-api:$tag -o tmp/openc3-cmd-tlm-api-$tag.tar
docker save openc3inc/openc3-script-runner-api:$tag -o tmp/openc3-script-runner-api-$tag.tar
docker save openc3inc/openc3-traefik:$tag -o tmp/openc3-traefik-$tag.tar
docker save openc3inc/openc3-redis:$tag -o tmp/openc3-redis-$tag.tar
docker save openc3inc/openc3-minio:$tag -o tmp/openc3-minio-$tag.tar
docker save openc3inc/openc3-init:$tag -o tmp/openc3-init-$tag.tar
}

loadTar() {
Expand Down
Loading