Skip to content

Commit 3d8f7a7

Browse files
committed
Replace deprecated ENV key value and LABEL key value syntax
with the current `ENV key=value` and `LABEL key=value` syntax. Also use help@osg-htc.org as our email address
1 parent 24484a0 commit 3d8f7a7

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ ARG BASE_OSG_SERIES=23
88
ARG BASE_OS=el9
99

1010
FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO AS xcache
11-
LABEL maintainer OSG Software <help@opensciencegrid.org>
11+
LABEL maintainer="OSG Software <help@osg-htc.org>"
1212

1313
# Previous arg has gone out of scope
1414
ARG BASE_YUM_REPO=testing
1515

1616
# Default root dir
17-
ENV XC_ROOTDIR /xcache/namespace
17+
ENV XC_ROOTDIR=/xcache/namespace
1818

1919
# Default logrotate XRootd logs
20-
ENV XC_NUM_LOGROTATE 10
20+
ENV XC_NUM_LOGROTATE=10
2121

2222
# Set namespace, data, and meta dir ownership to XRootD
23-
ENV XC_FIX_DIR_OWNERS yes
23+
ENV XC_FIX_DIR_OWNERS=yes
2424

2525
# Create the xrootd user with a fixed GID/UID
2626
RUN groupadd -o -g 10940 xrootd
@@ -70,12 +70,12 @@ WORKDIR /var/spool/xrootd
7070
################
7171

7272
FROM xcache AS atlas-xcache
73-
LABEL maintainer OSG Software <help@opensciencegrid.org>
73+
LABEL maintainer="OSG Software <help@osg-htc.org>"
7474

7575
# Specify the base Yum repository to get the necessary RPMs
7676
ARG BASE_YUM_REPO=testing
7777

78-
ENV XC_IMAGE_NAME atlas-xcache
78+
ENV XC_IMAGE_NAME=atlas-xcache
7979

8080
RUN yum install -y --enablerepo=osg-contrib \
8181
--exclude=alja-\* \
@@ -98,11 +98,11 @@ RUN mkdir -p /var/log/xrootd/atlas-xcache && \
9898
##############
9999

100100
FROM xcache AS cms-xcache
101-
LABEL maintainer OSG Software <help@opensciencegrid.org>
101+
LABEL maintainer="OSG Software <help@osg-htc.org>"
102102

103103
ARG BASE_YUM_REPO=testing
104104

105-
ENV XC_IMAGE_NAME cms-xcache
105+
ENV XC_IMAGE_NAME=cms-xcache
106106

107107
RUN yum install -y \
108108
cms-xcache \
@@ -128,11 +128,11 @@ EXPOSE 1094
128128
###############
129129

130130
FROM xcache AS stash-cache
131-
LABEL maintainer OSG Software <help@opensciencegrid.org>
131+
LABEL maintainer="OSG Software <help@osg-htc.org>"
132132

133133
ARG BASE_YUM_REPO=testing
134134

135-
ENV XC_IMAGE_NAME stash-cache
135+
ENV XC_IMAGE_NAME=stash-cache
136136

137137
RUN yum install -y stash-cache && \
138138
yum clean all --enablerepo=* && rm -rf /var/cache/
@@ -165,16 +165,16 @@ EXPOSE 8000
165165

166166

167167
FROM xcache AS stash-origin
168-
LABEL maintainer OSG Software <help@opensciencegrid.org>
168+
LABEL maintainer="OSG Software <help@osg-htc.org>"
169169

170170
# Specify the base Yum repository to get the necessary RPMs
171171
ARG BASE_YUM_REPO=testing
172172

173-
ENV XC_IMAGE_NAME stash-origin
173+
ENV XC_IMAGE_NAME=stash-origin
174174

175175
# Do not stomp on host volume mount ownership
176176
# Files and dirs should be readable to UID/GID 10940:10940 or the world
177-
ENV XC_FIX_DIR_OWNERS no
177+
ENV XC_FIX_DIR_OWNERS=no
178178

179179
# Add support for SSSD (SOFTWARE-5464)
180180
# sssd UID must match between the origin and SSSD sidecar containers

0 commit comments

Comments
 (0)