diff --git a/_scripts/fetch-upstream-resources.sh b/_scripts/fetch-upstream-resources.sh index 207fcffade..e46386814c 100755 --- a/_scripts/fetch-upstream-resources.sh +++ b/_scripts/fetch-upstream-resources.sh @@ -69,7 +69,6 @@ sedi "s/{{ site.latest_stable_docker_engine_api_version }}/$latest_stable_docker # Engine stable ENGINE_SVN_BRANCH="branches/18.09" ENGINE_BRANCH="18.09" -ENGINE_EDGE_BRANCH="18.09" # Distribution DISTRIBUTION_SVN_BRANCH="branches/release/2.6" @@ -150,13 +149,8 @@ wget -O ${SOURCE}/engine/api/v1.37/swagger.yaml https://raw.githubusercontent.co wget -O ${SOURCE}/engine/api/v1.38/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/18.06/components/engine/api/swagger.yaml || (echo "Failed 1.38 swagger download or the 1.38 directory doesn't exist" && exit -1) wget -O ${SOURCE}/engine/api/v1.39/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/18.09/components/engine/api/swagger.yaml || (echo "Failed 1.39 swagger download or the 1.39 directory doesn't exist" && exit -1) -# Get dockerd.md for stable and edge, from upstream +# Get dockerd.md from upstream wget -O ${SOURCE}/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch stable dockerd.md" && exit -1) -wget -O ${SOURCE}/edge/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_EDGE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch edge dockerd.md" && exit -1) - -# Add an admonition to the edge dockerd file -EDGE_DOCKERD_INCLUDE='{% include edge_only.md section=\"dockerd\" %}' -sedi "s/^#\ daemon/${EDGE_DOCKERD_INCLUDE}/1" ${SOURCE}/edge/engine/reference/commandline/dockerd.md # Get a few one-off files that we use directly from upstream wget -O ${SOURCE}/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/builder.md || (echo "Failed engine/reference/builder.md download" && exit -1)