Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for private docker registry #717

Merged
merged 2 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ jobs:
run: |
chmod +x contrib/free_disk_space.sh
./contrib/free_disk_space.sh
- name: Setup nydus
run: |
curl -LO https://github.com/dragonflyoss/nydus/releases/download/v2.2.4/nydus-static-v2.2.4-linux-amd64.tgz
tar -xvf nydus-static-v2.2.4-linux-amd64.tgz
chmod +x nydus-static/*
mv nydus-static/* /usr/local/bin/
rm -rf nydus-static-v2.2.4-linux-amd64.tgz nydus-static
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand All @@ -68,7 +75,6 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
Expand All @@ -86,6 +92,11 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=cdxgen
cache-to: type=gha,mode=max,scope=cdxgen
- name: nydusify
run: |
nydusify convert --source ghcr.io/cyclonedx/cdxgen:master --target ghcr.io/cyclonedx/cdxgen-nydus:master
nydusify check --source ghcr.io/cyclonedx/cdxgen:master --target ghcr.io/cyclonedx/cdxgen-nydus:master
if: github.ref == 'refs/heads/master'
- name: Extract metadata (tags, labels) for Docker
id: meta2
uses: docker/metadata-action@v4
Expand Down
2 changes: 1 addition & 1 deletion analyzer.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { parse } from "@babel/parser";

Check failure on line 1 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
import traverse from "@babel/traverse";

Check failure on line 2 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
import { join } from "node:path";

Check failure on line 3 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
import { readdirSync, lstatSync, readFileSync } from "node:fs";

Check failure on line 4 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
import { basename, resolve, isAbsolute, relative } from "node:path";

Check failure on line 5 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`

Check failure on line 6 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
const IGNORE_DIRS = process.env.ASTGEN_IGNORE_DIRS

Check failure on line 7 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
? process.env.ASTGEN_IGNORE_DIRS.split(",")

Check failure on line 8 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
: [

Check failure on line 9 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
"node_modules",

Check failure on line 10 in analyzer.js

View workflow job for this annotation

GitHub Actions / build (21.x, windows-latest)

Delete `␍`
"venv",
"docs",
"test",
Expand Down Expand Up @@ -108,7 +108,7 @@
}
const fileRelativeLoc = relative(src, file);
// remove unexpected extension imports
if (/\.(svg|png|jpg|d\.ts)/.test(pathway)) {
if (/\.(svg|png|jpg|json|d\.ts)/.test(pathway)) {
return;
}
const importedModules = specifiers
Expand Down
Loading