hochan@hochan-node:~/Desktop/pfc/dockercompose$ sudo docker-compose up --build
ERROR: Version in "./docker-compose.yml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a version of "2" (or "2.0") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
* DTR release notes for March 2020 Amberjack patch release
* updating dtr and ucp product versions and links to tarballs
* fixing typo
Co-authored-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
It's best-practice to not define these inside a "location" block
to prevent having to re-define them for each location.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Use relative redirects to account for situations where a front-end
proxy is used and the container does not know the public domain and
port.
Before this change, when running locally (on localhost:4000), redirects would omit
the port number, and redirect to localhost _without_ port number:
curl -v "http://localhost:4000/engine/reference/commandline/run"
* TCP_NODELAY set
* Connected to localhost (::1) port 4000 (#0)
> GET /engine/reference/commandline/run HTTP/1.1
> Host: localhost:4000
> User-Agent: curl/7.65.3
> Accept: */*
>
* Mark bundle as not supporting multiuse
< HTTP/1.1 301 Moved Permanently
< Server: nginx/1.17.8
< Date: Fri, 28 Feb 2020 13:46:10 GMT
< Content-Type: text/html
< Content-Length: 169
< Location: http://localhost/engine/reference/commandline/run/
< Connection: keep-alive
After this change, redirect will be "relative", so redirecting to the correct location:
curl -v "http://localhost:4000/engine/reference/commandline/run"
* TCP_NODELAY set
* Connected to localhost (::1) port 4000 (#0)
> GET /engine/reference/commandline/run HTTP/1.1
> Host: localhost:4000
> User-Agent: curl/7.65.3
> Accept: */*
>
* Mark bundle as not supporting multiuse
< HTTP/1.1 301 Moved Permanently
< Server: nginx/1.17.8
< Date: Fri, 28 Feb 2020 13:39:02 GMT
< Content-Type: text/html
< Content-Length: 169
< Connection: keep-alive
< Location: /engine/reference/commandline/run/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The "fetch-upstream-resources" script also updated the toc.yaml,
based on values in the _config.yml.
As a result, any change in either the "_config.yml" or "toc.yaml"
would also result in the upstream resources to be fetched again.
This patch separates the step to update the toc, so that the
upstream resources can be cached. This _does_ mean that remote
sources can get outdated (only will be rebuilt when changing
ENGINE_BRANCH or DISTRIBUTION_BRANCH). That should not be a
problem for actual deployments, which don't use caching.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The "deploybase" stage was only used for the final stage.
This patch inlines the steps from that stage to the final stage
itself. In the process, changing the order of copying the NGINX
configuration file to _after_ the docs were copied. This prevents
having to copy the archived docs when making a change in the NGINX
configuration. The NGINX configuration file _will_ now be copied
on each rebuild, but the file is small, and as such is still faster
than copying all archives.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The "deploy-source" stage was added in a previous refactor. While
this stage is useful to "export" all docs (including archives if
needed), and _convenient_ to collect all those files to the final
stage, it caused a regression in performance.
This patch changes the final ("deploy") to copy the "archives" and
"current" docs separately, so that the archived versions can be
cached in the final stage, and don't have to be copied again on
each rebuild.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This part of the script was setting variables for any "_version"
property in the configuration file.
We (currently) only need the engine API version, so simplifying
the code to just do that, and fix some spaces -> tabs indentations.
With this change the script only uses standard (POSIX) scripting,
so switching to use the standard (/bin/sh) shell.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These checks were now checking the literal "engine_svn_branch" and
"distribution_svn_branch" string, instead of the value of the variables.
This was introduced in 1f7d4ce871 (whoops!)
We currently don't use this functionality, so not a critical bug.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
