Merge branch 'master' into switching-to-typescript

Author: mstephen19

README.md

@@ -220,7 +220,7 @@ The build script contained in the **apify-docs/src** folder automatically upload
 ### Local testing
 
 1. Install Apiary gem `gem install apiaryio`
-2. After that, you can open the generated doc with the command: `apiary preview --path="./docs/api_v2/api-v2-reference.apib"`
+2. After that, you can open the generated doc with the command: `apiary preview --path="./content/docs/api_v2/api_v2_reference.apib"`
 
 ### Test
 

content/docs/actors/development/source_code.md

@@ -11,16 +11,14 @@ paths:
 
 # [](#source-code)Source code
 
-The **Source type** setting determines the location of the source code for the actor. It can have one of the following values: [Single JavaScript file](#single-javascript-file), [Multiple source files](#multiple-source-files), [Git repository](#git-repository), [Zip file](#zip-file) or [GitHub Gist](#github-gist).
+The **Source type** setting determines the location of the source code for the actor. It can have one of the following values: [Multiple source files](#multiple-source-files), [Git repository](#git-repository), [Zip file](#zip-file) or [GitHub Gist](#github-gist).
 
 ## [](#multiple-source-files) Multiple source files
 
 If the actor's source code requires the use of multiple files/directories, then it can be hosted on the Apify platform using this option. This is particularly useful when you need to add [**INPUT_SCHEMA.json**]({{@link actors/development/source_code.md#input-schema}}) or **README.md** to your actor, or if you want to create your actor in a language other than JavaScript.
 
 The only required file for multifile is **Dockerfile**, and all other files depend on your Dockerfile settings. By default Apify's custom NodeJS Dockerfile is used, which requires a **main.js** file containing your source code and a **package.json** file containing package configurations for [NPM](https://www.npmjs.com/).
 
-Unlike with the [single JavaScript file](#single-javascript-file) option, **package.json** is not automatically generated when you use multiple source files, so you need to configure it yourself.
-
 See [Custom Dockerfile]({{@link actors/development/source_code.md#custom-dockerfile}}) and [base Docker images]({{@link actors/development/base_docker_images.md}}) for more information about creating your own Dockerfile and using Apify's prepared base images.
 
 ## [](#git-repository)Git repository
@@ -37,7 +35,7 @@ Note that you can easily set up an integration where the actor is automatically
 
 ### [](#private-repositories)Private repositories
 
-If your source code is hosted in a private Git repository then you need to configure deployment key. Deployment key is different for each actor and might be used only once at Git hosting of your choice (Github, Bitbucket, Gitlab, etc.).
+If your source code is hosted in a private Git repository then you need to configure deployment key. Deployment key is different for each actor and might be used only once at Git hosting of your choice (GitHub, Bitbucket, GitLab, etc.).
 
 To obtain the key click at the **deployment key** link under the **Git URL** text input and follow the instructions there.
 
@@ -61,7 +59,7 @@ Similarly as with the [Git repository]({{@link actors/development/source_code.md
 
 ## [](#custom-dockerfile)Custom Dockerfile
 
-Internally, Apify uses Docker to build and run actors. To control the build of the actor, you can create a custom **Dockerfile** in the root of the Git repository or Zip directory. Note that this option is not available for the [Single JavaScript file]({{@link actors/development/source_code.md#single-javascript-file}}) option. If the **Dockerfile** is missing, the system uses the following default:
+Internally, Apify uses Docker to build and run actors. To control the build of the actor, you can create a custom **Dockerfile** in the root of the Git repository or Zip directory. If the **Dockerfile** is missing, the system uses the following default:
 
 ```dockerfile
 FROM apify/actor-node-basic
@@ -135,6 +133,8 @@ console.log(process.env.SMTP_HOST);
 
 The actor runtime sets additional environment variables for the actor process during the run. See [Environment variables]({{@link actors/development/environment_variables.md}}) for details.
 
+The environment variables can also be used for the build process. In this case, the variables are treated as [Docker build arguments](https://docs.docker.com/engine/reference/builder/#arg). This means that they should not be used for secrets and, in order to access them in Dockerfile, you have to use the `ARG variable_name` instruction.
+
 ## [](#versioning)Versioning
 
 In order to enable active development, the actor can have multiple versions of the source code and associated settings, such as the **Base image** and **Environment**. Each version is denoted by a version number of the form `MAJOR.MINOR`; the version numbers should adhere to the [Semantic Versioning](http://semver.org/) logic.

content/docs/api_v2/api_v2_reference.apib

@@ -562,13 +562,6 @@ The `sourceType` property indicates where the source code is hosted, and based
 on its value the Version object has the following additional property:
 
 <table>
-  <tr>
-    <td><code>"SOURCE_CODE"</code></td>
-    <td>
-        Source code is a single JavaScript/Node.js file whose content is in the <code>sourceCode</code> field,
-        and uses a base Docker image specified in <code>baseDockerImage</code>.
-    </td>
-  </tr>
   <tr>
     <td><code>"SOURCE_FILES"</code></td>
     <td>
@@ -3786,7 +3779,7 @@ The user account is identified by the provided authentication token.
 
 ## Version (object)
 - versionNumber:            `0.0`                           (string, required)
-- sourceType:               `SOURCE_CODE`                   (VersionSourceType, required)
+- sourceType:               `SOURCE_FILES`                  (VersionSourceType, required)
 - envVars                                                   (array, nullable)
     -                                                       (object)
         - name:             `DOMAIN`                        (string, required)
@@ -3795,10 +3788,25 @@ The user account is identified by the provided authentication token.
     -                                                       (object)
         - name:              `SECRET_PASSWORD`              (string, required)
         - isSecret:         true                            (boolean, nullable)
-- baseDockerImage:          `apify/actor-node-basic`        (string, nullable)
 - applyEnvVarsToBuild:       false                          (boolean, nullable)
 - buildTag:                 `latest`                        (string, required)
-- sourceCode:               `console.log('Hello world!');`  (string, nullable)
+- sourceFiles                                                   (array)
+    -(object)
+        - name: `src/main.js`                                   (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `console.log('This is the main.js file');`   (string, required)
+    -(object)
+        - name: `package.json`                                  (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `name: "My Scraper"`                         (string, required)
+    -(object)
+        - name: `Dockerfile`                                    (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: ` # Dockerfile contains instructions ...`                 (string, required)
+        -(object)
+        - name: `README.md`                                     (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `My Actor scrapes the web`                   (string, required)
 
 ## EnvVar (object)
 - name: `MY_ENV_VAR` (string, required)
@@ -3824,26 +3832,10 @@ The user account is identified by the provided authentication token.
     - isSecret: true         (boolean, nullable)
 
 ## ListOfVersions (array)
--                                                               (object)
-    - versionNumber:            `0.0`                           (string, required)
-    - sourceType:               `SOURCE_CODE`                   (VersionSourceType, required)
-    - envVars                                                   (array, nullable)
-        -                                                       (object)
-            - name:             `DOMAIN`                        (string, required)
-            - value:            `http://example.com`            (string, required)
-            - isSecret:         false                           (boolean, nullable)
-        -                                                       (object)
-            - name:              `SECRET_PASSWORD`              (string, required)
-            - isSecret:         true                            (boolean, nullable)
-    - baseDockerImage:          `apify/actor-node-basic`        (string, nullable)
-    - applyEnvVarsToBuild:       false                          (boolean, nullable)
-    - buildTag:                 `latest`                        (string, required)
-    - sourceCode:               `console.log('Hello world!');`  (string, nullable)
 -                                                               (object)
     - versionNumber:            `0.1`                           (string, required)
     - envVars:                  []                              (array, nullable)
     - sourceType:               `SOURCE_FILES`                  (VersionSourceType, required)
-    - sourceCode:               `console.log('Hello world!');`  (string, nullable)
     - applyEnvVarsToBuild:       false                          (boolean, nullable)
     - buildTag:                 `latest`                        (string, required)
     - sourceFiles                                                   (array)
@@ -3888,7 +3880,7 @@ The user account is identified by the provided authentication token.
 
 ## VersionUpdate (object)
 - versionNumber:            `0.0`                                (string, nullable)
-- sourceType:               `SOURCE_CODE`                        (VersionSourceType, nullable)
+- sourceType:               `SOURCE_FILES`                       (VersionSourceType, nullable)
 - envVars                                                        (array, nullable)
     -                                                            (object)
         - name:             `DOMAIN`                             (string, nullable)
@@ -3898,13 +3890,27 @@ The user account is identified by the provided authentication token.
         - name:              `SECRET_PASSWORD`                   (string, nullable)
         - value:            `MyTopSecretPassword123`             (string, nullable)
         - isSecret:         true                                 (boolean, nullable)
-- baseDockerImage:          `apify/actor-node-basic`             (string, nullable)
 - applyEnvVarsToBuild:       false                               (boolean, nullable)
 - buildTag:                 `latest`                             (string, nullable)
-- sourceCode:               `console.log('Hello world!');`       (string, nullable)
+- sourceFiles                                                   (array)
+    -(object)
+        - name: `src/main.js`                                   (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `console.log('This is the main.js file');`   (string, required)
+    -(object)
+        - name: `package.json`                                  (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `name: "My Scraper"`                         (string, required)
+    -(object)
+        - name: `Dockerfile`                                    (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: ` # Dockerfile contains instructions ...`                 (string, required)
+        -(object)
+        - name: `README.md`                                     (string, required)
+        - format: `TEXT`                                        (string, required)
+        - content: `My Actor scrapes the web`                   (string, required)
 
 ## VersionSourceType (enum)
-+ `SOURCE_CODE`
 + `SOURCE_FILES`
 + `GIT_REPO`
 + `TARBALL`