merged README from 6.x

This commit is contained in:
Vinay Aggarwal
2020-03-26 08:15:59 -07:00
parent 7d661f35f5
commit 0b633a6b4c
3 changed files with 72 additions and 100 deletions

View File

@@ -16,7 +16,7 @@ JFrog Container Registry can be installed into either an ECS or EKS cluster.
To simply get up and running, you can try: To simply get up and running, you can try:
```docker run -d -p 8081:8081 <image-url>``` ```docker run -d -p 8081:8081 -p 8082:8082 <image-url>```
After this, you can access the UI at \<URL\>:8081. The default username is 'admin'. See 'Getting or setting initial password' to find out how to get the initial password. After this, you can access the UI at \<URL\>:8081. The default username is 'admin'. See 'Getting or setting initial password' to find out how to get the initial password.
### Getting or setting initial password ### Getting or setting initial password

View File

@@ -1,27 +0,0 @@
{
"router": {
"node_id": "1dae71383ae3",
"state": "HEALTHY",
"message": "OK"
},
"services": [
{
"service_id": "jfac@01e49jb08bm7051xb2rp9k1ed8",
"node_id": "1dae71383ae3",
"state": "UNHEALTHY_PEER",
"message": "Service is healthy; there is at least one unhealthy service; there are missing services: jffe"
},
{
"service_id": "jfmd@01e49jbpqfhn39k8z3kyvqepzh",
"node_id": "1dae71383ae3",
"state": "UNHEALTHY_PEER",
"message": "Service is healthy; there is at least one unhealthy service; there are missing services: jffe"
},
{
"service_id": "jfrt@01e49jcq7t96ag11tq25h60759",
"node_id": "1dae71383ae3",
"state": "UNHEALTHY",
"message": "unexpected response status code: 503"
}
]
}

View File

@@ -1,9 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERSION=$1 VERSION=$1
EDITIONS=( artifactory-pro artifactory-jcr ) EDITIONS=( artifactory-pro artifactory-jcr )
#EDITIONS=( artifactory-jcr )
#EDITIONS=( artifactory-pro )
#for loop start: editoins #for loop start: editoins
for EDITION in "${EDITIONS[@]}" for EDITION in "${EDITIONS[@]}"
@@ -16,8 +13,8 @@ ARTIFACTORY_PASSWORD=corona1831
if [ -z "$VERSION" ] if [ -z "$VERSION" ]
then then
echo "No version passed in. Build failed." echo "No version passed in. Build failed."
echo "usage: buildAwsContainers <vesion> <edition>" echo "usage: buildAwsContainers <vesion>"
echo "example: buildAwsContainers artifactory-pro 7.2.1 " echo "example: buildAwsContainers 7.2.1 "
exit -1 exit -1
fi fi
@@ -31,7 +28,7 @@ perl -pe 's/^addExtraJavaArgs$/`cat extra_conf`/ge' original-entrypoint.sh > ent
#Create installer-info file #Create installer-info file
if [ "$EDITION" == "artifactory-pro" ] if [ "$EDITION" == "artifactory-pro" ]
then then
cat <<EOF > installer-info.json cat <<" EOF" > installer-info.json
{ {
"productId": "CloudFormation_artifactory-ha/$VERSION", "productId": "CloudFormation_artifactory-ha/$VERSION",
"features": [ "features": [
@@ -42,7 +39,7 @@ then
} }
EOF EOF
else else
cat <<EOF > installer-info.json cat <<" EOF" > installer-info.json
{ {
"productId": "CloudFormation_artifactory-jcr/$VERSION", "productId": "CloudFormation_artifactory-jcr/$VERSION",
"features": [ "features": [
@@ -75,15 +72,17 @@ do
sleep 10 sleep 10
done done
if [ "$SUCCESS" = true ] ; then
echo "Test Succeeded. Build succeeded."
else
echo "Test failed. Build failed. Removing docker image"
fi
#clearnup #clearnup
docker stop test-new-image docker stop test-new-image
docker rm test-new-image docker rm test-new-image
rm installer-info.json rm installer-info.json
if [ "$SUCCESS" = true ] ; then
echo "Test Succeeded. Build succeeded."
else
echo "Test failed. Build failed. Removing docker image"
exit 1
fi
#for loop endL: editions #for loop endL: editions
done done