diff --git a/block-storage-attacher/Dockerfile.fips b/block-storage-attacher/Dockerfile.fips index d367c41..9f3ae19 100644 --- a/block-storage-attacher/Dockerfile.fips +++ b/block-storage-attacher/Dockerfile.fips @@ -60,7 +60,7 @@ LABEL travis_build_number=${travis_build_number} COPY --from=builder --chown=2000 /image / -WORKDIR /home/armada-storage/ +WORKDIR /image/ USER 2000:2000 diff --git a/block-storage-attacher/go.mod b/block-storage-attacher/go.mod index 2a8d800..5e46f32 100644 --- a/block-storage-attacher/go.mod +++ b/block-storage-attacher/go.mod @@ -44,7 +44,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.26.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/block-storage-attacher/go.sum b/block-storage-attacher/go.sum index 58e1c4e..212b2ed 100644 --- a/block-storage-attacher/go.sum +++ b/block-storage-attacher/go.sum @@ -504,6 +504,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= diff --git a/block-storage-attacher/images/run.sh b/block-storage-attacher/images/run.sh index 476d28b..1548fb4 100755 --- a/block-storage-attacher/images/run.sh +++ b/block-storage-attacher/images/run.sh @@ -13,12 +13,12 @@ set -ex #VOLUME_CONFIG_FILE="/host/etc/iscsi-block-volume.conf" # Copy block volume configurations -cp /home/armada-storage/iscsi-block-volume.conf /host/etc/ +cp home/armada-storage/iscsi-block-volume.conf /host/etc/ # Copy service files mkdir -p /host/lib/ibmc-block-attacher -cp /home/armada-storage/iscsi-attach.sh /host/lib/ibmc-block-attacher/ -cp /home/armada-storage/ibmc-block-attacher.service /host/lib/systemd/system/ +cp home/armada-storage/iscsi-attach.sh /host/lib/ibmc-block-attacher/ +cp home/armada-storage/ibmc-block-attacher.service /host/lib/systemd/system/ ln -s -f /lib/systemd/system/ibmc-block-attacher.service /host/etc/systemd/system/multi-user.target.wants/ibmc-block-attacher.service # Set the volume details from environment variables of pod to conf file @@ -27,8 +27,8 @@ ln -s -f /lib/systemd/system/ibmc-block-attacher.service /host/etc/systemd/syste #sed -i 's//'$PASSWORD'/' $VOLUME_CONFIG_FILE #sed -i 's//'$TARGET'/' $VOLUME_CONFIG_FILE -/home/armada-storage/systemutil -action reload -/home/armada-storage/systemutil -target ibmc-block-attacher.service -action start -/home/armada-storage/block-storage-attacher +home/armada-storage/systemutil -action reload +home/armada-storage/systemutil -target ibmc-block-attacher.service -action start +home/armada-storage/block-storage-attacher set +ex