containerify 3.1.0 → 3.1.1

package/README.md

@@ -45,7 +45,7 @@ This will take the `nginx:alpine` image, and copy the files from `./dist/` into
 
 1. Create the repository in GitLab
 2. Login using your username and password, [CI-credentials](https://docs.gitlab.com/ee/ci/jobs/ci_job_token.html), or [obtain a token from GitLab](https://docs.gitlab.com/ee/api/container_registry.html#obtain-token-from-gitlab)
-3. Example using CI-credentials `containerify --toToken "Basic $(echo -n '${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}' | base64)" --to registry.gitlab.com/<Gitlab organisation>/<repository>:<tag>`
+3. Example using CI-credentials `containerify --toToken "Basic $(echo -n "${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" | base64)" --to registry.gitlab.com/<Gitlab organisation>/<repository>:<tag>`
 
 ### Command line options
 

package/lib/registry.js

@@ -130,19 +130,12 @@ function processToken(registryBaseUrl, allowInsecure, imagePath, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const { hostname } = URL.parse(registryBaseUrl);
         const image = (0, utils_1.parseImage)(imagePath);
-        if ((hostname === null || hostname === void 0 ? void 0 : hostname.endsWith(".docker.io")) && !token) {
-            const resp = yield (0, httpRequest_1.dlJson)(`https://auth.docker.io/token?service=registry.docker.io&scope=repository:${image.path}:pull`, {}, allowInsecure);
-            return `Bearer ${resp.token}`;
-        }
-        if ((hostname === null || hostname === void 0 ? void 0 : hostname.endsWith(".gitlab.com")) && (token === null || token === void 0 ? void 0 : token.startsWith("Basic"))) {
-            if (token === null || token === void 0 ? void 0 : token.includes(":")) {
-                token = "Basic " + Buffer.from(token === null || token === void 0 ? void 0 : token.replace("Basic ", "")).toString("base64");
-            }
-            const resp = yield (0, httpRequest_1.dlJson)(`https://gitlab.com/jwt/auth?service=container_registry&scope=repository:${image.path}:pull,push`, { Authorization: token }, allowInsecure);
-            return `Bearer ${resp.token}`;
-        }
+        if ((hostname === null || hostname === void 0 ? void 0 : hostname.endsWith(".docker.io")) && !token)
+            return getDockerToken(image.path, allowInsecure);
         if (!token)
             return ""; //We allow to pull from tokenless registries
+        if ((hostname === null || hostname === void 0 ? void 0 : hostname.endsWith(".gitlab.com")) && token.startsWith("Basic "))
+            return getGitLabToken(token, image.path, allowInsecure);
         if (token.startsWith("Basic "))
             return token;
         if (token.startsWith("ghp_"))
@@ -150,6 +143,21 @@ function processToken(registryBaseUrl, allowInsecure, imagePath, token) {
         return "Bearer " + token;
     });
 }
+function getDockerToken(imagePath, allowInsecure) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const resp = yield (0, httpRequest_1.dlJson)(`https://auth.docker.io/token?service=registry.docker.io&scope=repository:${imagePath}:pull`, {}, allowInsecure);
+        return `Bearer ${resp.token}`;
+    });
+}
+function getGitLabToken(token, imagePath, allowInsecure) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (token.includes(":")) {
+            token = "Basic " + Buffer.from(token === null || token === void 0 ? void 0 : token.replace("Basic ", "")).toString("base64");
+        }
+        const resp = yield (0, httpRequest_1.dlJson)(`https://gitlab.com/jwt/auth?service=container_registry&scope=repository:${imagePath}:pull,push`, { Authorization: token }, allowInsecure);
+        return `Bearer ${resp.token}`;
+    });
+}
 function createRegistry(registryBaseUrl, imagePath, allowInsecure, auth, optimisticToRegistryCheck = false) {
     return __awaiter(this, void 0, void 0, function* () {
         const token = yield processToken(registryBaseUrl, allowInsecure, imagePath, auth);
@@ -173,8 +181,8 @@ function createRegistry(registryBaseUrl, imagePath, allowInsecure, auth, optimis
                     const url = `${registryBaseUrl}${image.path}/blobs/uploads/${parameters.size > 0 ? "?" + parameters : ""}`;
                     const options = URL.parse(url);
                     options.method = "POST";
-                    if (auth)
-                        options.headers = { authorization: auth };
+                    if (token)
+                        options.headers = { authorization: token };
                     (0, httpRequest_1.request)(options, allowInsecure, (res) => {
                         logger_1.default.debug("POST", `${url}`, res.statusCode);
                         if (res.statusCode == 202) {

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.1.0";
+export declare const VERSION = "3.1.1";

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "3.1.0";
+exports.VERSION = "3.1.1";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {