Cleaning up labeling

osg-htc · Jan 22, 2024 · 12ad281 · 12ad281
1 parent 3610225
commit 12ad281
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 33 deletions.
diff --git a/htc/rocky:9/Dockerfile b/htc/rocky:9/Dockerfile
@@ -1,10 +1,10 @@
 FROM rockylinux:9
 
-LABEL opensciencegrid.name="EL 9"
-LABEL opensciencegrid.description="Enterprise Linux (Rocky) 9 base image"
+LABEL opensciencegrid.name="Rocky 9"
+LABEL opensciencegrid.description="Rocky Linux 9 base image"
 LABEL opensciencegrid.url="https://rockylinux.org/"
 LABEL opensciencegrid.category="Base"
-LABEL opensciencegrid.definition_url="https://github.com/opensciencegrid/osgvo-el9"
+LABEL opensciencegrid.definition_url="https://github.com/osg-htc/htc-images"
 
 # base dnf/yum setup
 RUN dnf -y update && \
@@ -82,9 +82,6 @@ RUN dnf -y install --allowerasing --enablerepo=osg-testing \
 # Cleaning caches to reduce size of image
 RUN dnf clean all
 
-RUN mkdir -p /.singularity.d
-COPY osg-labels.json /.singularity.d/labels.json
-
 # build info
 RUN echo "Timestamp:" `date --utc` | tee /image-build-info.txt
 
diff --git a/htc/rocky:9/osg-labels.json b/htc/rocky:9/osg-labels.json
diff --git a/htc/scikit-learn:1.3/Dockerfile b/htc/scikit-learn:1.3/Dockerfile
@@ -27,6 +27,3 @@ RUN URL=$(curl -L -s https://api.github.com/repos/htcondor/osdf-client/releases/
     apt install ./stashcp.deb && \
     rm -f stashcp.deb
 
-# labeling
-RUN mkdir -p /.singularity.d
-COPY osg-labels.json /.singularity.d/labels.json
diff --git a/htc/scikit-learn:1.3/osg-labels.json b/htc/scikit-learn:1.3/osg-labels.json
diff --git a/htc/tensorflow:2.15/Dockerfile b/htc/tensorflow:2.15/Dockerfile
@@ -27,6 +27,3 @@ RUN URL=$(curl -L -s https://api.github.com/repos/htcondor/osdf-client/releases/
     apt install ./stashcp.deb && \
     rm -f stashcp.deb
 
-# labeling
-RUN mkdir -p /.singularity.d
-COPY osg-labels.json /.singularity.d/labels.json
diff --git a/htc/tensorflow:2.15/osg-labels.json b/htc/tensorflow:2.15/osg-labels.json