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

Fix ability to disable headless with a -1, and improve logging #262

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
- name: checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: donwload schema
run: curl https://schema.org/version/latest/schemaorg-current-https.jsonld --output assets/schemaorg-current-https.jsonld
- name: donwload schema
Expand All @@ -52,13 +52,13 @@ jobs:
# - name: Checkout Repo
# uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: 'arm64,arm'
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -68,7 +68,7 @@ jobs:
echo "VERSION=$VER" >> $GITHUB_ENV
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: nsfearthcube/gleaner
flavor: |
Expand All @@ -80,7 +80,7 @@ jobs:
type=semver,pattern={{version}}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/docker_glcon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
- name: checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: donwload schema
run: curl https://schema.org/version/latest/schemaorg-current-https.jsonld --output assets/schemaorg-current-https.jsonld
- name: donwload schema
Expand All @@ -71,19 +71,19 @@ jobs:
# - name: Checkout Repo
# uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: ${{matrix.goarch}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
flavor: |
Expand All @@ -95,7 +95,7 @@ jobs:

- name: Build and push
id: build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
#push: true
platforms: ${{ matrix.platform }}
Expand Down Expand Up @@ -133,11 +133,11 @@ jobs:
path: /tmp/digests
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
flavor: |
Expand All @@ -149,7 +149,7 @@ jobs:

-
name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/docker_gleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- master
- dev_ec
- dev
- 239_dev_headless
tags:
- v3.*
release:
Expand Down Expand Up @@ -47,7 +48,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
- name: checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: donwload schema
run: curl https://schema.org/version/latest/schemaorg-current-https.jsonld --output assets/schemaorg-current-https.jsonld
- name: donwload schema
Expand Down Expand Up @@ -87,19 +88,19 @@ jobs:
# - name: Checkout Repo
# uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: ${{matrix.goarch}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
flavor: |
Expand All @@ -110,7 +111,7 @@ jobs:
type=semver,pattern={{version}}
- name: Build and push
id: build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
#push: true
platforms: ${{ matrix.platform }}
Expand Down Expand Up @@ -148,11 +149,11 @@ jobs:
path: /tmp/digests
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
flavor: |
Expand Down
2 changes: 1 addition & 1 deletion cmd/husker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func main() {

runStats := common.NewRunStats()
repostats := runStats.Add(k)
err = acquire.PageRenderAndUpload(v1, mc, 45*time.Second, url, k, rlogginer, repostats)
err = acquire.PageRenderAndUpload(v1, mc, 45*time.Second, url, k, rlogginer, repostats, nil, "")
if err != nil {
panic(fmt.Errorf("error when reading config: %v", err))
}
Expand Down
Loading
Loading