Skip to content
Snippets Groups Projects
Commit a6f8fef6 authored by Daniel Lyons's avatar Daniel Lyons Committed by Andrew Kapuscinski
Browse files

Rename marconi -> ssa-containers

parent dc36e7e0
No related branches found
No related tags found
1 merge request!275Rename marconi -> ssa-containers
Pipeline #1847 passed
......@@ -27,7 +27,7 @@ variables:
# CI Postgres Service
services:
- name: marconi.aoc.nrao.edu/ops/ci/db:workspaces
- name: ssa-containers.aoc.nrao.edu/ops/ci/db:workspaces
alias: db
image: docker:19.03.12
......
......@@ -43,12 +43,12 @@ docker-dev-images-locally:
# Build base image
docker-base: db
docker build --no-cache -t marconi.aoc.nrao.edu/ops/base:workspaces -f Dockerfile.base .
docker build --no-cache -t marconi.aoc.nrao.edu/ops/base:nodejs-14 -f apps/web/Dockerfile.base .
docker build --no-cache -t ssa-containers.aoc.nrao.edu/ops/base:workspaces -f Dockerfile.base .
docker build --no-cache -t ssa-containers.aoc.nrao.edu/ops/base:nodejs-14 -f apps/web/Dockerfile.base .
# Build DB image
db:
docker build --no-cache -t marconi.aoc.nrao.edu/ops/ci/db:workspaces -f ./ci/psql/Dockerfile.db .
docker build --no-cache -t ssa-containers.aoc.nrao.edu/ops/ci/db:workspaces -f ./ci/psql/Dockerfile.db .
# Build docker images
build: docker-base db
......
FROM marconi.aoc.nrao.edu/ops/base:nodejs-14 as base-build
FROM ssa-containers.aoc.nrao.edu/ops/base:nodejs-14 as base-build
# Switch to vlapipe
USER vlapipe
......
FROM marconi.aoc.nrao.edu/ops/base:nodejs-14
FROM ssa-containers.aoc.nrao.edu/ops/base:nodejs-14
# set container working directory to /code
WORKDIR /code/
......@@ -13,4 +13,4 @@ ENV NG_CLI_ANALYTICS=false
RUN npm install
# start Angular development server
CMD [ "./node_modules/.bin/ng", "serve", "--host", "0.0.0.0" ]
\ No newline at end of file
CMD [ "./node_modules/.bin/ng", "serve", "--host", "0.0.0.0" ]
......@@ -10,10 +10,10 @@ make docker-base
```
In the Makefile, this Docker command is run:
```sh
docker build -t marconi.aoc.nrao.edu/ops/base:workspaces -f Dockerfile.base .
docker build -t ssa-containers.aoc.nrao.edu/ops/base:workspaces -f Dockerfile.base .
```
This builds a local Docker image tagged as `marconi.aoc.nrao.edu/ops/base:workspaces` on your machine
This builds a local Docker image tagged as `ssa-containers.aoc.nrao.edu/ops/base:workspaces` on your machine
using the `Dockerfile.base` Dockerfile.
Once the image has been built, Docker will save this image on your machine. You do not need to run the `make docker-base`
......
......@@ -2,7 +2,7 @@ version: '3.8'
services:
workflow:
image: marconi.aoc.nrao.edu/workspaces/workflow:${CI_COMMIT_SHORT_SHA}
image: ssa-containers.aoc.nrao.edu/workspaces/workflow:${CI_COMMIT_SHORT_SHA}
expose:
- "3456"
environment:
......@@ -12,7 +12,7 @@ services:
- /home/casa/capo/dsoc-ci.properties:/home/casa/capo/dsoc-ci.properties
capability:
image: marconi.aoc.nrao.edu/workspaces/capability:${CI_COMMIT_SHORT_SHA}
image: ssa-containers.aoc.nrao.edu/workspaces/capability:${CI_COMMIT_SHORT_SHA}
expose:
- "3457"
environment:
......@@ -22,7 +22,7 @@ services:
- /home/casa/capo/dsoc-ci.properties:/home/casa/capo/dsoc-ci.properties
notification:
image: marconi.aoc.nrao.edu/workspaces/notification:${CI_COMMIT_SHORT_SHA}
image: ssa-containers.aoc.nrao.edu/workspaces/notification:${CI_COMMIT_SHORT_SHA}
expose:
- "3458"
environment:
......@@ -32,7 +32,7 @@ services:
- /home/casa/capo/dsoc-ci.properties:/home/casa/capo/dsoc-ci.properties
web:
image: marconi.aoc.nrao.edu/workspaces/web:${CI_COMMIT_SHORT_SHA}
image: ssa-containers.aoc.nrao.edu/workspaces/web:${CI_COMMIT_SHORT_SHA}
expose:
- "80"
environment:
......
......@@ -2,7 +2,7 @@ version: '3.8'
services:
workflow:
image: marconi.aoc.nrao.edu/workspaces/workflow:${TAG}
image: ssa-containers.aoc.nrao.edu/workspaces/workflow:${TAG}
networks:
- host
secrets:
......@@ -34,7 +34,7 @@ services:
- /home/casa/capo:/home/casa/capo
capability:
image: marconi.aoc.nrao.edu/workspaces/capability:${TAG}
image: ssa-containers.aoc.nrao.edu/workspaces/capability:${TAG}
ports:
- target: 3457
published: 3457
......@@ -64,7 +64,7 @@ services:
order: stop-first
notification:
image: marconi.aoc.nrao.edu/workspaces/notification:${TAG}
image: ssa-containers.aoc.nrao.edu/workspaces/notification:${TAG}
ports:
- target: 3458
published: 3458
......@@ -94,7 +94,7 @@ services:
order: stop-first
web:
image: marconi.aoc.nrao.edu/workspaces/web:${TAG}
image: ssa-containers.aoc.nrao.edu/workspaces/web:${TAG}
ports:
- target: 80
published: 4444
......
......@@ -13,7 +13,7 @@ services:
- ./tmp/:/tmp/workspaces_tmp
- ./delivery_root:/tmp/delivery_root
db:
image: marconi.aoc.nrao.edu/ops/ci/db:workspaces
image: ssa-containers.aoc.nrao.edu/ops/ci/db:workspaces
restart: always
ports:
- "54322:5432"
......
# This is nrao:schema
# The purpose of this is just to run the alembic migrations against the database in a docker-compose environment
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
WORKDIR /code/schema
......
# This is nrao:capability
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Change working directory to /code
WORKDIR /code
......
# This is nrao:capability
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Get capability code into the image
WORKDIR /code
......
# This is nrao:notification
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Change working directory to /code
WORKDIR /code
......
# This is nrao:notification
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Get workflow code into the image
WORKDIR /code
......
# This is nrao:workflow
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# HTCondor install
RUN apt update && apt install -y wget gnupg sudo
......
# Workflow service layer
# This is nrao:workflow
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Get workflow code into the image
WORKDIR /code
......
# FROM python:3.8-slim-buster
FROM marconi.aoc.nrao.edu/ops/base:workspaces
FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
# Installing Oracle instant client
WORKDIR /opt/oracle
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment