Skip to content

Commit 718a508

Browse files
committed
Move dockerfiles under dev-docker dir [RHELDST-39375]
The dockerfiles in this repository are now used only for local deployment and public konflux workflows. The production dockerfiles now lives under ubi-manifest-workflows repo. This commit therefore renames their directory to dev-docker and updates docker-compose.yml, tekton build pipelines and README to reflect the change.
1 parent f711ddd commit 718a508

8 files changed

Lines changed: 27 additions & 11 deletions

.tekton/ubi-manifest-app-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- name: image-expires-after
2929
value: 5d
3030
- name: dockerfile
31-
value: docker/Dockerfile-app
31+
value: dev-docker/Dockerfile-app
3232
- name: path-context
3333
value: .
3434
pipelineSpec:

.tekton/ubi-manifest-app-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: output-image
2626
value: quay.io/redhat-user-workloads/ubi-manifest-tenant/ubi-manifest-app:{{revision}}
2727
- name: dockerfile
28-
value: docker/Dockerfile-app
28+
value: dev-docker/Dockerfile-app
2929
- name: path-context
3030
value: .
3131
pipelineSpec:

README.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,30 @@ pip install -r requirements-dev.txt
2828
pre-commit install
2929
```
3030

31+
CI/CD
32+
-----------
33+
After a PR is merged, new ubi-manifest-app image is built and pushed to [Quay](https://quay.io/repository/redhat-user-workloads/ubi-manifest-tenant/ubi-manifest-app) via build pipelines under `.tekton` directory.
34+
This image is tracked in [ubi-manifest-workflows](https://gitlab.cee.redhat.com/exd-guild-ubipop/ubi-manifest-workflows) repo in `latest-quay-image.yaml` file and regularly updated via renovate. The renovate's MR with the updated image digest triggers the downstream Konflux pipelines, defined in that repo. These pipelines then build, test and release the new code automatically.
35+
36+
3137
Dev-env setup:
3238
--------------
3339

34-
For running ubi-manifest related containers one can use provided docker-compose file.
35-
For successful running of celery tasks, it's required to properly update the config file ./conf/app.conf
36-
with credentials to pulp and gitlab repository with ubi-config files.
37-
There are certs prepared in ./conf/certs/ for accessing dependent services,
38-
if any different certs are required, copy them to the directory.
40+
It is also possible to build and run ubi-manifest service locally, using provided `docker-compose.yml` and docker files under `dev-docker/` directory.
41+
You also need to update the config file `./conf/app.conf`:
42+
- `pulp_url`: URL to rhsm-pulp instance you want to use
43+
- `content_config`: dictionary of repo group and URL with respective config files
44+
- `pulp_<cert|key>`: path to rhsm-pulp cert and key
45+
46+
OR
47+
- `pulp_<username|password>` rhsm-pulp username and password
48+
49+
**Note**: If you use pulp cert and key, you need to copy them into `./conf/` directory
50+
and update the `dev-docker/Dockerfile-app` and `dev-docker/Dockerfile-worker` to also COPY these certs into the build context. The path where the certs are copied must be the same as you put in the `./conf/app.conf`:
51+
```
52+
COPY ./conf/my-pulp.crt /etc/ubi_manifest/my-pulp.crt
53+
COPY ./conf/my-pulp.key /etc/ubi_manifest/my-pulp.key
54+
```
3955

4056
Then podman-compose can be used for building and running the service:
4157
```

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ services:
22
redis:
33
build:
44
context: .
5-
dockerfile: ./docker/Dockerfile-broker
5+
dockerfile: ./dev-docker/Dockerfile-broker
66
ports:
77
- 6379:6379
88
container_name: ubi-manifest-redis
99

1010
worker:
1111
build:
1212
context: .
13-
dockerfile: ./docker/Dockerfile-workers
13+
dockerfile: ./dev-docker/Dockerfile-workers
1414
environment:
1515
- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
1616
depends_on:
@@ -19,7 +19,7 @@ services:
1919
beat:
2020
build:
2121
context: .
22-
dockerfile: ./docker/Dockerfile-beat
22+
dockerfile: ./dev-docker/Dockerfile-beat
2323
environment:
2424
- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
2525
depends_on:
@@ -29,7 +29,7 @@ services:
2929
app:
3030
build:
3131
context: .
32-
dockerfile: ./docker/Dockerfile-app
32+
dockerfile: ./dev-docker/Dockerfile-app
3333
environment:
3434
- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
3535
command:

0 commit comments

Comments
 (0)