Compare commits

..

3 Commits

Author SHA1 Message Date
48fe4ba396
Version 0.2.2 2024-02-27 15:20:45 +01:00
535d13222d
Update dependencies 2024-02-27 14:39:26 +01:00
Nikolai Rodionov
a008e20cc7
fix: Fix the Dockerfile, so it can build again
I think I've just forgotten to add `-y` to apt-get. So the image could
not be built because it was waiting for a user's input

Issue: https://git.badhouseplants.net/allanger/dumb-downloader/issues/9
2023-06-24 10:01:46 +02:00
7 changed files with 504 additions and 460 deletions

View File

@ -1,48 +0,0 @@
---
name: "Build container"
on:
push:
jobs:
containerization:
runs-on: ubuntu-latest
permissions:
packages: write
strategy:
fail-fast: false
matrix:
include:
- arch: amd64
- arch: arm64
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install buildah
run: sudo apt update && sudo apt install -y podman buildah qemu-user-static
- name: Set version tag (only if triggered by pushing a tag)
if: startsWith(github.ref, 'refs/tags/v')
run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Set latest tag (only if triggered by pushing to the main branch)
if: github.ref == 'main'
run: echo "TAG=latest" >> $GITHUB_ENV
- name: Set action link variable
run: echo "LINK=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV
- name: Login in gchr registry
run: buildah login --username ${{ github.repository_owner }} --password ${{ secrets.GITHUB_TOKEN }} ghcr.io
- name: Build an image
run: |
buildah bud -t ghcr.io/${{ github.repository }}:${{ github.sha }}-${{ matrix.arch }} \
--label action_id=${{ github.action }} \
--label action_link=${{ env.LINK }} \
--label actor=${{ github.actor }} \
--label sha=${{ github.sha }} \
--label ref=${{ github.ref }} \
.

52
.github/workflows/container-latest.yaml vendored Normal file
View File

@ -0,0 +1,52 @@
---
name: "Latest container"
on:
push:
branches:
- main
jobs:
containerization:
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set action link variable
run: echo "LINK=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@master
with:
platforms: all
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@master
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/${{ github.repository }}:latest
labels: |
action_id=${{ github.action }}
action_link=${{ env.LINK }}
actor=${{ github.actor }}
sha=${{ github.sha }}
ref=${{ github.ref }}

844
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,13 @@
[package]
name = "dudo"
version = "0.2.1"
version = "0.2.2"
edition = "2021"
[dependencies]
clap = { version = "4.1.1", features = ["derive", "env"] }
handlebars = "4.3.1"
env_logger = "0.10.0"
handlebars = "5.1.0"
env_logger = "0.11.2"
log = "0.4.17"
http = "0.2.8"
serde = { version = "1.0.126", features = ["derive"] }
reqwest = { version = "0.11", features = ["json", "blocking", "rustls"] }
serde_yaml = "0.9"

View File

@ -1,4 +1,4 @@
FROM registry.hub.docker.com/library/rust:1.70.0-slim-bookworm as builder
FROM rust:1.76.0-slim-bookworm as builder
WORKDIR /src
RUN apt-get update &&\
apt-get install -y libssl-dev gcc musl pkg-config
@ -9,8 +9,8 @@ RUN cargo build --release --jobs 2 -Z sparse-registry
FROM debian:stable
COPY --from=builder /src/target/release/dudo /bin/dudo
RUN apt-get update -y &&\
apt-get install openssl ca-certificates -y &&\
RUN apt-get update &&\
apt-get install -y openssl ca-certificates &&\
apt-get clean -y
RUN chmod +x /bin/dudo
WORKDIR /workdir

View File

@ -1,6 +1,5 @@
use clap::Parser;
use handlebars::Handlebars;
use http::StatusCode;
use log::{error, info};
use serde::{Deserialize, Serialize};
@ -119,8 +118,8 @@ fn main() {
};
info!("Running on {} {}", OS, ARCH);
let oss = config.os.get(&OS.clone().to_string()).unwrap();
let archs = config.arch.get(&ARCH.clone().to_string()).unwrap();
let oss = config.os.get(&OS.to_string()).unwrap();
let archs = config.arch.get(&ARCH.to_string()).unwrap();
for arch in archs {
for os in oss {
@ -134,7 +133,7 @@ fn main() {
let link = reg.render("download_link", &values).unwrap();
info!("Trying to download from {}", link.clone());
let mut resp = reqwest::blocking::get(link).unwrap();
if resp.status() == StatusCode::OK {
if resp.status().is_success() {
info!("Response is 200, I'll try to download");
let mut out =
File::create(args.download_path.clone()).expect("failed to create file");