Skip to content

Commit

Permalink
rename docker repo prefixes to osg-htc
Browse files Browse the repository at this point in the history
  • Loading branch information
mwestphall committed Oct 11, 2024
1 parent a6ae410 commit 8604829
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions docs/data/run-frontier-squid-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ To run a Frontier Squid container with the defaults:
user@host $ docker run --rm --name frontier-squid \
-v <HOST CACHE PARTITION>:/var/cache/squid \
-v <HOST LOG PARTITION>:/var/log/squid \
-p <HOST PORT>:3128 opensciencegrid/frontier-squid:24-release
-p <HOST PORT>:3128 hub.opensciencegrid.org/osg-htc/frontier-squid:24-release
```

You may pass configuration variables in `KEY=VALUE` format with either
Expand Down Expand Up @@ -112,8 +112,8 @@ TimeoutStartSec=0
Restart=always
ExecStartPre=-/usr/bin/docker stop %n
ExecStartPre=-/usr/bin/docker rm %n
ExecStartPre=/usr/bin/docker pull opensciencegrid/frontier-squid:24-release
ExecStart=/usr/bin/docker run --rm --name %n --publish 3128:3128 -v /tmp/squid:/var/cache/squid -v /tmp/log:/var/log/squid --env-file /opt/xcache/.env opensciencegrid/frontier-squid:24-release
ExecStartPre=/usr/bin/docker pull hub.opensciencegrid.org/osg-htc/frontier-squid:24-release
ExecStart=/usr/bin/docker run --rm --name %n --publish 3128:3128 -v /tmp/squid:/var/cache/squid -v /tmp/log:/var/log/squid --env-file /opt/xcache/.env hub.opensciencegrid.org/osg-htc/frontier-squid:24-release
[Install]
Expand Down
6 changes: 3 additions & 3 deletions docs/data/stashcache/run-stash-origin-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ user@host $ docker run --rm --publish 1094:1094 --publish 1095:1095 \
--volume <HOST CERT>:/etc/grid-security/hostcert.pem \
--volume <HOST KEY>:/etc/grid-security/hostkey.pem \
--env-file=/opt/origin/.env \
opensciencegrid/stash-origin:24-release
hub.opensciencegrid.org/osg-htc/stash-origin:24-release
```

Replacing `<HOST PARTITION>` with the host directory containing data that your origin should serve.
Expand Down Expand Up @@ -173,15 +173,15 @@ TimeoutStartSec=0
Restart=always
ExecStartPre=-/usr/bin/docker stop %n
ExecStartPre=-/usr/bin/docker rm %n
ExecStartPre=/usr/bin/docker pull opensciencegrid/stash-origin:24-release
ExecStartPre=/usr/bin/docker pull hub.opensciencegrid.org/osg-htc/stash-origin:24-release
ExecStart=/usr/bin/docker run --rm --name %n \
--publish 1094:1094 \
--publish 1095:1095 \
--volume /srv/origin:/xcache/namespace \
--volume /etc/ssl/host.crt:/etc/grid-security/hostcert.pem \
--volume /etc/ssl/host.key:/etc/grid-security/hostkey.pem \
--env-file /opt/origin/.env \
opensciencegrid/stash-origin:24-release
hub.opensciencegrid.org/osg-htc/stash-origin:24-release
[Install]
WantedBy=multi-user.target
Expand Down
10 changes: 5 additions & 5 deletions docs/data/stashcache/run-stashcache-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ user@host $ docker run --rm \
...
--volume <DATA PARTITION N>:/xcache/dataN
--env-file=/opt/xcache/.env \
opensciencegrid/stash-cache:24-release
hub.opensciencegrid.org/osg-htc/stash-cache:24-release
```

!!! warning
Expand All @@ -225,7 +225,7 @@ user@host $ docker run --rm \
--volume <HOST CERT>:/etc/grid-security/hostcert.pem \
--volume <HOST KEY>:/etc/grid-security/hostkey.pem \
--env-file=/opt/xcache/.env \
opensciencegrid/stash-cache:24-release
hub.opensciencegrid.org/osg-htc/stash-cache:24-release
```

### Running a cache on container with systemd
Expand All @@ -251,15 +251,15 @@ TimeoutStartSec=0
Restart=always
ExecStartPre=-/usr/bin/docker stop %n
ExecStartPre=-/usr/bin/docker rm %n
ExecStartPre=/usr/bin/docker pull opensciencegrid/stash-cache:24-release
ExecStartPre=/usr/bin/docker pull hub.opensciencegrid.org/osg-htc/stash-cache:24-release
ExecStart=/usr/bin/docker run --rm --name %n \
--publish 8000:8000 \
--publish 8443:8443 \
--volume /srv/cache:/xcache \
--volume /etc/ssl/host.crt:/etc/grid-security/hostcert.pem \
--volume /etc/ssl/host.key:/etc/grid-security/hostkey.pem \
--env-file /opt/xcache/.env \
opensciencegrid/stash-cache:24-release
hub.opensciencegrid.org/osg-htc/stash-cache:24-release
[Install]
WantedBy=multi-user.target
Expand Down Expand Up @@ -289,7 +289,7 @@ user@host $ docker run --rm \
--volume <HOST CERT>:/etc/grid-security/hostcert.pem \
--volume <HOST KEY>:/etc/grid-security/hostkey.pem \
--env-file=/opt/xcache/.env \
opensciencegrid/stash-cache:24-release
hub.opensciencegrid.org/osg-htc/stash-cache:24-release
```

### Memory optimization ###
Expand Down
4 changes: 2 additions & 2 deletions docs/resource-sharing/os-backfill-containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ docker run -it --rm --user osg \
-e CVMFSEXEC_REPOS=" \
oasis.opensciencegrid.org \
singularity.opensciencegrid.org" \
opensciencegrid/osgvo-docker-pilot:23-release
hub.opensciencegrid.org/osg-htc/osgvo-docker-pilot:23-release
```

Replace `/path/to/token` with the location you saved the token obtained from the OSPool Token Registry.
Expand Down Expand Up @@ -203,7 +203,7 @@ docker run -it --rm --user osg \
-e GLIDEIN_ResourceName="..." \
-e GLIDEIN_Start_Extra="True" \
-e OSG_SQUID_LOCATION="..." \
opensciencegrid/osgvo-docker-pilot:23-release
hub.opensciencegrid.org/osg-htc/osgvo-docker-pilot:23-release
```

Fill in the values for `/path/to/token`, `/worker-temp-dir`, `GLIDEIN_Site`, `GLIDEIN_ResourceName`, and `OSG_SQUID_LOCATION` [as above](#running-the-container-with-docker).
Expand Down
2 changes: 1 addition & 1 deletion docs/security/tokens/using-tokens.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ which is useful for looking inside tokens.
1. Start an agent container in the background and name it `my-agent` to easily run subsequent commands against it:

:::console
docker run -d --name my-agent opensciencegrid/oidc-agent:23-release
docker run -d --name my-agent hub.opensciencegrid.org/osg-htc/oidc-agent:23-release

1. Generate a local client profile and follow the prompts:

Expand Down
4 changes: 2 additions & 2 deletions docs/worker-node/using-wn-containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Building Upon the Container
You may base the container on the OSG worker node by including it inside your `Dockerfile`:

```
FROM opensciencegrid/osg-wn:latest
FROM hub.opensciencegrid.org/osg-htc/osg-wn:latest
```

You can replace `latest` with any tag listed above.
Expand All @@ -35,6 +35,6 @@ Perform Testing
You may perform testing from within the OSG worker node envionment by running the command:

```
root@host # docker run -ti --rm opensciencegrid/osg-wn:latest /bin/bash
root@host # docker run -ti --rm hub.opensciencegrid.org/osg-htc/osg-wn:latest /bin/bash
```

0 comments on commit 8604829

Please sign in to comment.