Skip to content

Commit f00f94f

Browse files
committed
Fix: Manila image additions for sudo and tmp directories
Found a few missing packages and tmp directories in the DFW.dev deploy of Manila. Building new images with changes. Alphabetized apt packages.
1 parent 8bb6476 commit f00f94f

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

ContainerFiles/manila

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
117117
&& find / -name '__pycache__' -delete \
118118
&& groupadd --system --gid 42424 manila \
119119
&& useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
120+
&& mkdir -p /var/lib/manila/tmp \
120121
&& mkdir -p /var/lib/openstack/etc/manila \
121122
&& ln -s /var/lib/openstack/etc/manila /etc/manila \
122123
&& chown manila:manila -h /etc/manila \
123-
&& chown -R manila:manila /var/lib/openstack/etc/manila
124+
&& chown -R manila:manila /var/lib/openstack/etc/manila \
125+
&& chown -R manila:manila /var/lib/manila
124126
# Set the environment variables for the manila venv
125127
ENV PATH="/var/lib/openstack/bin:$PATH"
126128
# Set the working directory

ContainerFiles/manila-data

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3535
pkg-config \
3636
python3-dev \
3737
ssl-cert \
38+
sudo \
3839
xmlsec1
3940
RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
4041
RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
@@ -104,6 +105,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
104105
python3-dev \
105106
squashfs-tools \
106107
ssl-cert \
108+
sudo \
107109
ucf \
108110
xmlsec1 \
109111
xz-utils \
@@ -120,10 +122,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
120122
&& find / -name '__pycache__' -delete \
121123
&& groupadd --system --gid 42424 manila \
122124
&& useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
125+
&& mkdir -p /var/lib/manila/tmp \
123126
&& mkdir -p /var/lib/openstack/etc/manila \
124127
&& ln -s /var/lib/openstack/etc/manila /etc/manila \
125128
&& chown manila:manila -h /etc/manila \
126-
&& chown -R manila:manila /var/lib/openstack/etc/manila
129+
&& chown -R manila:manila /var/lib/openstack/etc/manila \
130+
&& chown -R manila:manila /var/lib/manila
127131
# Set the environment variables for the manila venv
128132
ENV PATH="/var/lib/openstack/bin:$PATH"
129133
# Set the working directory

ContainerFiles/manila-scheduler

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
115115
&& find / -name '__pycache__' -delete \
116116
&& groupadd --system --gid 42424 manila \
117117
&& useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
118+
&& mkdir -p /var/lib/manila/tmp \
118119
&& mkdir -p /var/lib/openstack/etc/manila \
119120
&& ln -s /var/lib/openstack/etc/manila /etc/manila \
120121
&& chown manila:manila -h /etc/manila \
121-
&& chown -R manila:manila /var/lib/openstack/etc/manila
122+
&& chown -R manila:manila /var/lib/openstack/etc/manila \
123+
&& chown -R manila:manila /var/lib/manila
122124
# Set the environment variables for the manila venv
123125
ENV PATH="/var/lib/openstack/bin:$PATH"
124126
# Set the working directory

ContainerFiles/manila-share

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3939
postgresql-client \
4040
pkg-config \
4141
python3-dev \
42+
sudo \
4243
ssl-cert \
4344
xmlsec1
4445
RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
@@ -110,6 +111,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
110111
pkg-config \
111112
python3-dev \
112113
squashfs-tools \
114+
sudo \
113115
ssl-cert \
114116
ucf \
115117
xmlsec1 \
@@ -127,10 +129,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
127129
&& find / -name '__pycache__' -delete \
128130
&& groupadd --system --gid 42424 manila \
129131
&& useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
132+
&& mkdir -p /var/lib/manila/tmp \
130133
&& mkdir -p /var/lib/openstack/etc/manila \
131134
&& ln -s /var/lib/openstack/etc/manila /etc/manila \
132135
&& chown manila:manila -h /etc/manila \
133-
&& chown -R manila:manila /var/lib/openstack/etc/manila
136+
&& chown -R manila:manila /var/lib/openstack/etc/manila \
137+
&& chown -R manila:manila /var/lib/manila
134138
# Set the environment variables for the manila venv
135139
ENV PATH="/var/lib/openstack/bin:$PATH"
136140
# Set the working directory

0 commit comments

Comments
 (0)