1
0
mirror of https://github.com/cmur2/dyndnsd.git synced 2025-08-08 08:33:56 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
depfu[bot]
3f4cb2ea77 gems: update rubocop-rspec to version 2.29.2 2024-05-16 15:39:09 +00:00
cn
c9caa5ba66 project: disable Depfu for Renovate since PR creation fails 2024-05-16 17:28:30 +02:00
11 changed files with 24 additions and 63 deletions

View File

@@ -1,13 +0,0 @@
---
version: 2
updates:
- package-ecosystem: "bundler"
directory: "/"
schedule:
interval: "weekly"
commit-message:
prefix: "gems"
labels: ["dependabot"]
open-pull-requests-limit: 10
pull-request-branch-name:
separator: "-"

View File

@@ -15,18 +15,6 @@
commitMessageTopic: "{{depName}}", commitMessageTopic: "{{depName}}",
commitMessageExtra: "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}", commitMessageExtra: "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
packageRules: [ packageRules: [
// Ruby dependencies are managed by depfu
{
matchManagers: ["bundler"],
enabled: false,
},
// Only quarter update since noisy/stable tools
{
matchPackageNames: [
"aquasecurity/trivy",
],
schedule: ["* 0-8 1 */3 *"],
},
// Commit message formats // Commit message formats
{ {
matchDatasources: ["docker"], matchDatasources: ["docker"],

View File

@@ -42,7 +42,7 @@ jobs:
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
- name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }} - name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }}
uses: docker/build-push-action@v6 uses: docker/build-push-action@v5
with: with:
context: docker context: docker
build-args: | build-args: |

View File

@@ -22,7 +22,6 @@ jobs:
- '3.1' - '3.1'
- '3.2' - '3.2'
- '3.3' - '3.3'
- '3.4'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby-version }} - name: Set up Ruby ${{ matrix.ruby-version }}

View File

@@ -1,4 +1,4 @@
plugins: require:
- rubocop-rake - rubocop-rake
- rubocop-rspec - rubocop-rspec

View File

@@ -1,11 +1,5 @@
# Changelog # Changelog
## 3.11.0
IMPROVEMENTS:
- add Ruby 3.4 support
## 3.10.0 ## 3.10.0
IMPROVEMENTS: IMPROVEMENTS:

View File

@@ -3,9 +3,11 @@
require 'bundler/gem_tasks' require 'bundler/gem_tasks'
require 'rspec/core/rake_task' require 'rspec/core/rake_task'
require 'rubocop/rake_task' require 'rubocop/rake_task'
require 'bundler/audit/task'
RSpec::Core::RakeTask.new(:spec) RSpec::Core::RakeTask.new(:spec)
RuboCop::RakeTask.new RuboCop::RakeTask.new
Bundler::Audit::Task.new
desc 'Run experimental solargraph type checker' desc 'Run experimental solargraph type checker'
task :solargraph do task :solargraph do
@@ -16,7 +18,7 @@ end
hadolint_version = 'v2.12.0' hadolint_version = 'v2.12.0'
# renovate: datasource=github-tags depName=aquasecurity/trivy # renovate: datasource=github-tags depName=aquasecurity/trivy
trivy_version = 'v0.61.0' trivy_version = 'v0.50.4'
namespace :docker do namespace :docker do
ci_image = 'cmur2/dyndnsd:ci' ci_image = 'cmur2/dyndnsd:ci'
@@ -48,7 +50,7 @@ namespace :docker do
chmod a+w e2e/db.json chmod a+w e2e/db.json
SCRIPT SCRIPT
sh "docker run -d --name=dyndnsd-ci -v $(pwd)/e2e:/etc/dyndnsd -p 8080:8080 -p 5353:5353 #{ci_image}" sh "docker run -d --name=dyndnsd-ci -v $(pwd)/e2e:/etc/dyndnsd -p 8080:8080 -p 5353:5353 #{ci_image}"
sh 'sleep 5' sh 'sleep 1'
puts '----------------------------------------' puts '----------------------------------------'
# `dig` needs `sudo apt-get install -y -q dnsutils` # `dig` needs `sudo apt-get install -y -q dnsutils`
sh <<~SCRIPT sh <<~SCRIPT
@@ -66,14 +68,7 @@ namespace :docker do
end end
end end
namespace :bundle do task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
desc 'Check for vulnerabilities with bundler-audit'
task :audit do
sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m' if !RUBY_VERSION.start_with?('3.0')
end
end
task default: [:rubocop, :spec, 'bundle:audit']
desc 'Run all tasks desired for CI' desc 'Run all tasks desired for CI'
task ci: [:default, 'docker:lint', :build, 'docker:build', 'docker:e2e'] task ci: [:default, 'docker:lint', :build, 'docker:build', 'docker:e2e']

View File

@@ -1,4 +1,4 @@
FROM alpine:3.21.3 FROM alpine:3.19.1
EXPOSE 5353 8080 EXPOSE 5353 8080

View File

@@ -1,4 +1,4 @@
FROM alpine:3.21.3 FROM alpine:3.19.1
EXPOSE 5353 8080 EXPOSE 5353 8080

View File

@@ -27,25 +27,23 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0' s.required_ruby_version = '>= 3.0'
s.add_dependency 'async', '~> 1.31.0' s.add_runtime_dependency 'async', '~> 1.31.0'
s.add_dependency 'async-dns', '~> 1.3.0' s.add_runtime_dependency 'async-dns', '~> 1.3.0'
s.add_dependency 'base64', '>= 0.2', '< 0.4' # needed for async s.add_runtime_dependency 'metriks'
s.add_dependency 'logger', '>= 1.6', '< 1.8' s.add_runtime_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
s.add_dependency 'metriks' s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0' s.add_runtime_dependency 'opentelemetry-sdk', '~> 1.2.0'
s.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0' s.add_runtime_dependency 'rack', '~> 3.0'
s.add_dependency 'opentelemetry-sdk', '~> 1.2.0' s.add_runtime_dependency 'rackup', '~> 2'
s.add_dependency 'rack', '~> 3.0' s.add_runtime_dependency 'webrick', '>= 1.6.1'
s.add_dependency 'rackup', '~> 2'
s.add_dependency 'webrick', '>= 1.6.1'
s.add_development_dependency 'bundler' s.add_development_dependency 'bundler'
s.add_development_dependency 'bundler-audit', '~> 0.9.0' s.add_development_dependency 'bundler-audit', '~> 0.9.0'
s.add_development_dependency 'rack-test' s.add_development_dependency 'rack-test'
s.add_development_dependency 'rake' s.add_development_dependency 'rake'
s.add_development_dependency 'rspec' s.add_development_dependency 'rspec'
s.add_development_dependency 'rubocop', '~> 1.75.1' s.add_development_dependency 'rubocop', '~> 1.61.0'
s.add_development_dependency 'rubocop-rake', '~> 0.7.1' s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
s.add_development_dependency 'rubocop-rspec', '~> 3.6.0' s.add_development_dependency 'rubocop-rspec', '~> 2.29.2'
s.add_development_dependency 'solargraph', '~> 0.49.0' s.add_development_dependency 'solargraph', '~> 0.50.0'
end end

View File

@@ -138,7 +138,7 @@ module Dyndnsd
# @param params [Hash{String => String}] # @param params [Hash{String => String}]
# @return [Array<String>] # @return [Array<String>]
def extract_v4_and_v6_address(params) def extract_v4_and_v6_address(params)
return [] if !params['myip'] return [] if !(params['myip'])
begin begin
IPAddr.new(params['myip'], Socket::AF_INET) IPAddr.new(params['myip'], Socket::AF_INET)
IPAddr.new(params['myip6'], Socket::AF_INET6) IPAddr.new(params['myip6'], Socket::AF_INET6)
@@ -207,7 +207,7 @@ module Dyndnsd
params = Rack::Utils.parse_query(env['QUERY_STRING']) params = Rack::Utils.parse_query(env['QUERY_STRING'])
# require hostname parameter # require hostname parameter
return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !params['hostname'] return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !(params['hostname'])
hostnames = params['hostname'].split(',') hostnames = params['hostname'].split(',')