Merge branch 'master' into master
diff --git a/README.md b/README.md
index b8cc5a7..2e8a341 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
-# RocketMQ-Docker [](https://www.apache.org/licenses/LICENSE-2.0.html)
+# RocketMQ-Docker
+[](https://www.apache.org/licenses/LICENSE-2.0.html)
+[](http://isitmaintained.com/project/apache/rocketmq-docker "Average time to resolve an issue")
+[](http://isitmaintained.com/project/apache/rocketmq-docker "Percentage of issues still open")
+
+
This is the Git repo of the Docker Image for Apache RocketMQ. You could run it through the following ways:
@@ -25,7 +30,7 @@
sh build-image.sh RMQ-VERSION BASE-IMAGE
```
-> Tip: The supported RMQ-VERSIONs can be obtained from [here](https://dist.apache.org/repos/dist/release/rocketmq/). The supported BASE-IMAGEs are [centos, alpine]. For example: ```sh build-image.sh 4.5.0 alpine```
+> Tip: The supported RMQ-VERSIONs can be obtained from [here](https://archive.apache.org/dist/rocketmq/). The supported BASE-IMAGEs are [centos, alpine]. For example: ```sh build-image.sh 4.5.0 alpine```
### B. Stage a specific version
@@ -35,6 +40,7 @@
sh stage.sh RMQ-VERSION
```
+> Note: RMQ-VERSION is the tag of the RocketMQ image.
After executing the above shell script, (e.g. sh stage.sh 4.5.0), it will generate a stage directory (./stages/4.5.0). User can do the following works under the directory, assuming the RMQ-version is defined with 4.5.0.
#### 1. Single Node
diff --git a/image-build/Dockerfile-alpine b/image-build/Dockerfile-alpine
index 977c2c7..90bbda5 100644
--- a/image-build/Dockerfile-alpine
+++ b/image-build/Dockerfile-alpine
@@ -43,8 +43,8 @@
# Install
RUN set -eux; \
apk add --virtual .build-deps curl gnupg unzip; \
- curl -L https://dist.apache.org/repos/dist/release/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \
- curl -L https://dist.apache.org/repos/dist/release/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \
+ curl -L https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \
+ curl -L https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \
#https://www.apache.org/dist/rocketmq/KEYS
curl -L https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \
\
diff --git a/image-build/Dockerfile-centos b/image-build/Dockerfile-centos
index 6e83074..17b2a06 100644
--- a/image-build/Dockerfile-centos
+++ b/image-build/Dockerfile-centos
@@ -47,8 +47,8 @@
WORKDIR ${ROCKETMQ_HOME}
RUN set -eux; \
- curl -L https://dist.apache.org/repos/dist/release/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \
- curl -L https://dist.apache.org/repos/dist/release/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \
+ curl -L https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \
+ curl -L https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \
#https://www.apache.org/dist/rocketmq/KEYS
curl -L https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \
\
diff --git a/image-build/build-image.sh b/image-build/build-image.sh
index 2f8657c..6073271 100755
--- a/image-build/build-image.sh
+++ b/image-build/build-image.sh
@@ -23,7 +23,7 @@
return 1
fi
- echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://dist.apache.org/repos/dist/release/rocketmq/'"
+ echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://archive.apache.org/dist/rocketmq/'"
exit -1
}
diff --git a/image-build/update.sh b/image-build/update.sh
index 21fde5c..0678125 100755
--- a/image-build/update.sh
+++ b/image-build/update.sh
@@ -23,14 +23,14 @@
return 0
fi
- echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://dist.apache.org/repos/dist/release/rocketmq/'"
+ echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://archive.apache.org/dist/rocketmq/'"
exit -1
}
set -eu;
# Update the image of the latest released version
-LATEST_VERSION=$(curl -s https://dist.apache.org/repos/dist/release/rocketmq/ | grep -B1 "KEYS" | grep -v "KEYS" | awk -F '>' '{print $3}' | awk -F '/' '{print $1}')
+LATEST_VERSION=$(curl -s https://archive.apache.org/dist/rocketmq/ | awk -F '>' '{print $3}' | awk -F '/' '{print $1}' | grep '^[0-9]' | sort | tail -1)
checkVersion ${LATEST_VERSION}
diff --git a/stage.sh b/stage.sh
index cb7898f..3e57ca2 100644
--- a/stage.sh
+++ b/stage.sh
@@ -23,7 +23,7 @@
return 1
fi
- echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://dist.apache.org/repos/dist/release/rocketmq/'"
+ echo "Version $1 illegal, it should be X.X.X format(e.g. 4.5.0), please check released versions in 'https://archive.apache.org/dist/rocketmq/'"
return 0
}
diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 6534e0d..ca39d02 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -26,7 +26,7 @@
- ./data/broker/logs:/home/rocketmq/logs
- ./data/broker/store:/home/rocketmq/store
- ./data/broker/conf/broker.conf:/opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
- command: sh mqbroker -c ../conf/broker.conf
+ command: sh mqbroker -c /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
#Service for another broker -- broker1
broker1:
@@ -44,4 +44,4 @@
- ./data1/broker/logs:/home/rocketmq/logs
- ./data1/broker/store:/home/rocketmq/store
- ./data1/broker/conf/broker.conf:/opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
- command: sh mqbroker -c ../conf/broker.conf
+ command: sh mqbroker -c /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
