Skip to content

Commit 8f4d729

Browse files
authored
Merge pull request #52 from rohanjayaraj/v129-v109
Refresh CSI drivers - Fuse 1.2.9 and NFS 1.0.9
2 parents 5d83dff + e2ae8c9 commit 8f4d729

File tree

20 files changed

+1074
-25
lines changed

20 files changed

+1074
-25
lines changed

build/fuse/Dockerfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,26 @@ FROM centos:centos8
44
LABEL mapr.os=centos8
55
ENV container docker
66

7+
# Download keys
8+
WORKDIR /tmp
9+
RUN curl --user "<email>:<token>" -o /tmp/maprgpg.key -q https://package.ezmeral.hpe.com/releases/pub/maprgpg.key; \
10+
curl --user "<email>:<token>" -o /tmp/gnugpg.key -q https://package.ezmeral.hpe.com/releases/pub/gnugpg.key; \
11+
curl --user "<email>:<token>" -o /tmp/hpeezdf.pub -q https://package.ezmeral.hpe.com/releases/pub/hpeezdf.pub;
12+
713
# Setup repos and dl prereqs + Mapr Core
814
COPY mapr.repo /etc/yum.repos.d/
915
RUN rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8; \
10-
rpm --import https://package.mapr.com/releases/pub/maprgpg.key; \
11-
rpm --import https://package.mapr.com/releases/pub/gnugpg.key; \
16+
rpm --import /tmp/gnugpg.key; \
17+
rpm --import /tmp/hpeezdf.pub; \
18+
rpm --import /tmp/maprgpg.key; \
19+
rm -rf /tmp/*.key /tmp/*.pub; \
1220
yum -y update && yum -y clean all; \
1321
yum -y install epel-release; \
14-
sed -i 's/^mirror/#mirror/g' /etc/yum.repos.d/epel.repo; \
22+
sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*; \
23+
sed -i 's/^#baseurl/baseurl/g' /etc/yum.repos.d/CentOS-*; \
24+
sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/CentOS-*; \
1525
yum install -y mapr-client mapr-posix-client-basic mapr-posix-client-platinum && \
16-
yum -y update && yum clean all && rm -rf /var/cache/yum; \
26+
yum clean all && rm -rf /var/cache/yum; \
1727
mkdir -p /opt/mapr/lib/fusebasic /opt/mapr/lib/fuseplatinum; \
1828
cp /opt/mapr/lib/libMapRClient_c.so.1 /opt/mapr/lib/fusebasic/libMapRClient_c.so.0; \
1929
rm -rf /opt/mapr/lib/libMapRClient_c.so.1

build/fuse/docker-custom-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
docker build --force-rm --pull -t docker.io/maprtech/csi-customkdfplugin:latest .
3+
docker build --progress=plain --force-rm --pull -t docker.io/maprtech/csi-customkdfplugin:latest .

build/fuse/mapr.repo

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
[MapR_Core]
22
name = MapR Core Components
33
enabled = 1
4-
baseurl = http://package.mapr.com/releases/v6.2.0/redhat/
4+
baseurl = https://package.ezmeral.hpe.com/releases/v7.6.1/redhat/
5+
username = <EMAIL>
6+
password = <TOKEN>
57
protected = 1
68
gpgcheck = 1
79

810
[MapR_MEP]
911
name = MapR MEP Components
1012
enabled = 1
11-
baseurl = http://package.mapr.com/releases/MEP/MEP-7.1.0/redhat/
13+
baseurl = https://package.ezmeral.hpe.com/releases/MEP/MEP-9.2.1/redhat/
14+
username = <EMAIL>
15+
password = <TOKEN>
1216
protected = 1
1317
gpgcheck = 1

build/nfs/Dockerfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22
FROM centos:centos8
33
LABEL mapr.os=centos8
44
ENV container docker
5+
6+
# Download keys
7+
WORKDIR /tmp
8+
RUN curl --user "<email>:<token>" -o /tmp/maprgpg.key -q https://package.ezmeral.hpe.com/releases/pub/maprgpg.key; \
9+
curl --user "<email>:<token>" -o /tmp/gnugpg.key -q https://package.ezmeral.hpe.com/releases/pub/gnugpg.key; \
10+
curl --user "<email>:<token>" -o /tmp/hpeezdf.pub -q https://package.ezmeral.hpe.com/releases/pub/hpeezdf.pub;
11+
512
# Setup repos and dl prereqs + Mapr Core
613
COPY mapr.repo /etc/yum.repos.d/
714
RUN rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8; \
8-
rpm --import https://package.mapr.com/releases/pub/maprgpg.key; \
9-
rpm --import https://package.mapr.com/releases/pub/gnugpg.key; \
15+
rpm --import /tmp/gnugpg.key; \
16+
rpm --import /tmp/hpeezdf.pub; \
17+
rpm --import /tmp/maprgpg.key; \
18+
rm -rf /tmp/*.key /tmp/*.pub; \
1019
yum -y update && yum -y clean all; \
1120
yum -y install epel-release; \
12-
sed -i 's/^mirror/#mirror/g' /etc/yum.repos.d/epel.repo; \
13-
sed -i 's/^#base/base/g' /etc/yum.repos.d/epel.repo; \
21+
sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*; \
22+
sed -i 's/^#baseurl/baseurl/g' /etc/yum.repos.d/CentOS-*; \
23+
sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/CentOS-*; \
1424
yum install -y mapr-loopbacknfs; \
1525
yum clean all && rm -rf /var/cache/yum
1626

build/nfs/docker-custom-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
docker build --force-rm --pull -t docker.io/maprtech/csi-customnfsplugin:latest .
3+
docker build --progress=plain --force-rm --pull -t docker.io/maprtech/csi-customnfsplugin:latest .

build/nfs/mapr.repo

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
[MapR_Core]
22
name = MapR Core Components
33
enabled = 1
4-
baseurl = http://package.mapr.com/releases/v6.2.0/redhat/
4+
baseurl = https://package.ezmeral.hpe.com/releases/v7.6.1/redhat/
5+
username = <EMAIL>
6+
password = <TOKEN>
7+
protected = 1
8+
gpgcheck = 1
9+
10+
[MapR_MEP]
11+
name = MapR MEP Components
12+
enabled = 1
13+
baseurl = https://package.ezmeral.hpe.com/releases/MEP/MEP-9.2.1/redhat/
14+
username = <EMAIL>
15+
password = <TOKEN>
516
protected = 1
617
gpgcheck = 1

0 commit comments

Comments
 (0)