diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..5bbffc51f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,23 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +max_line_length = 140 +indent_style = space +indent_size = 4 +tab_width = 4 +insert_final_newline = true + +[*.java] +ij_java_class_count_to_use_import_on_demand = 9999 +ij_java_names_count_to_use_import_on_demand = 9999 + +[{*.pom,*.xml}] +indent_style = tab +ij_xml_attribute_wrap = off + + +[*.{yaml,yml}] +indent_size = 2 +ij_yaml_keep_indents_on_empty_lines = false diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..e5a6b0376 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +* @docker-java/team + diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..9bcef2d88 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,16 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: weekly + day: monday + open-pull-requests-limit: 99 + rebase-strategy: disabled + ignore: + - dependency-name: "org.glassfish.jersey.connectors:jersey-apache-connector" + update-types: [ "version-update:semver-major" ] + - dependency-name: "org.glassfish.jersey.core:jersey-client" + update-types: [ "version-update:semver-major" ] + - dependency-name: "org.glassfish.jersey.inject:jersey-hk2" + update-types: [ "version-update:semver-major" ] diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 000000000..f570cce43 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,19 @@ +tag-template: $NEXT_PATCH_VERSION +name-template: '$NEXT_PATCH_VERSION' +categories: + - title: '🚀 Features' + labels: + - 'type/feature' + - title: '📈 Enhancements' + labels: + - 'type/enhancement' + - title: '🐛 Bug Fixes' + labels: + - 'type/bug' + - title: '🧰 Maintenance' + label: 'type/housekeeping' +change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +template: | + ## Changes + + $CHANGES diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..23aefd1f3 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,16 @@ + +daysUntilStale: 90 + +daysUntilClose: 30 + +exemptLabels: + - resolution/acknowledged + +staleLabel: resolution/stale + +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + +closeComment: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57bc0a8ee..5a87a3c3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,16 +1,55 @@ name: CI -on: [push, pull_request] +on: + pull_request: {} + push: { branches: [ main ] } + workflow_dispatch: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 + strategy: + fail-fast: false + matrix: + include: + - { name: "default", javaVersion: 8 } + - { name: "default", javaVersion: 17 } + - { name: "default", javaVersion: 21 } + steps: + - uses: actions/checkout@v6 + - name: Set up JDK + uses: actions/setup-java@v5 + with: + java-version: ${{matrix.javaVersion}} + distribution: temurin + cache: maven + - name: Configure Docker + id: setup_docker + uses: docker/setup-docker-action@v4 + with: + channel: stable + - name: Build with Maven + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} + run: ./mvnw --no-transfer-progress verify + tcp: + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v1 - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Build with Maven - run: mvn verify + - uses: actions/checkout@v6 + - name: Set up JDK + uses: actions/setup-java@v5 + with: + java-version: 8 + distribution: temurin + cache: maven + - name: Configure Docker + id: setup_docker + uses: docker/setup-docker-action@v4 + with: + channel: stable + tcp-port: 2375 + - name: Build with Maven + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} + run: ./mvnw --no-transfer-progress verify diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 000000000..99cd01cfc --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,16 @@ +name: Release Drafter + +on: + push: + # branches to consider in the event; optional, defaults to all + branches: + - main + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + # Drafts your next Release notes as Pull Requests are merged into "master" + - uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..d3ddc4b2e --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,32 @@ +name: Release + +on: + release: + types: + - prereleased + - released + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v6 + - name: Set up JDK 8 + uses: actions/setup-java@v5 + with: + java-version: 8 + distribution: temurin + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_CENTRAL_TOKEN + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: Set version + run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" + # TODO check main's CI status + - name: Deploy with Maven + env: + MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + run: ./mvnw -Prelease deploy -DskipTests diff --git a/.gitignore b/.gitignore index 5399371c4..006641e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,14 +6,14 @@ .project .settings .classpath +.factorypath # Ignore all build/dist directories target +dependency-reduced-pom.xml # Ignore InteliJ Idea project files -.idea -!.idea/codeStyleSettings.xml -!.idea/encodings.xml +.idea/ *.iml *.iws *.ipr diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9e5672189..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 9e5f39465..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..8dea6c227 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 35ce5e286..000000000 --- a/.travis.yml +++ /dev/null @@ -1,62 +0,0 @@ -sudo: required -dist: trusty -language: java - -services: - - docker - -jdk: - - oraclejdk8 - -install: true - -env: - global: - - CODECOV=true - - DOCKER_TLS_VERIFY="" - # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created - # via the "travis encrypt" command using the project repo's public key - - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" - - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java" - - COVERITY_SCAN_BRANCH_PATTERN="master" - - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" - - matrix: -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.06.2~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.8" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.8" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" -# - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" -# - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" -# - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" -# - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" - -cache: - directories: - - $HOME/.travis_cache - - /tmp/coverity-cache - - $HOME/.m2 # install will pollute it - -before_install: - - pip install --user codecov - - ./.travis/travis-before-install.sh - -script: - - ./.travis/travis-script.sh - -after_success: - - ./.travis/travis-after-success.sh - -#after_script: -# - sudo cat /var/log/upstart/docker.log diff --git a/.travis/get-docker-com.sh b/.travis/get-docker-com.sh deleted file mode 100755 index d9c0142a2..000000000 --- a/.travis/get-docker-com.sh +++ /dev/null @@ -1,313 +0,0 @@ -#!/bin/sh -set -e -# -# This script is meant for quick & easy install via: -# 'curl -sSL https://get.docker.com/ | sh' -# or: -# 'wget -qO- https://get.docker.com/ | sh' -# -# For test builds (ie. release candidates): -# 'curl -fsSL https://test.docker.com/ | sh' -# or: -# 'wget -qO- https://test.docker.com/ | sh' -# -# For experimental builds: -# 'curl -fsSL https://experimental.docker.com/ | sh' -# or: -# 'wget -qO- https://experimental.docker.com/ | sh' -# -# Docker Maintainers: -# To update this script on https://get.docker.com, -# use hack/release.sh during a normal release, -# or the following one-liner for script hotfixes: -# aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index -# - -url="https://get.docker.com/" -apt_url="https://apt.dockerproject.org" -yum_url="https://yum.dockerproject.org" -gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D" - -key_servers=" -ha.pool.sks-keyservers.net -pgp.mit.edu -keyserver.ubuntu.com -" - -command_exists() { - command -v "$@" > /dev/null 2>&1 -} - -semverParse() { - major="${1%%.*}" - minor="${1#$major.}" - minor="${minor%%.*}" - patch="${1#$major.$minor.}" - patch="${patch%%[-.]*}" -} - -do_install() { - case "$(uname -m)" in - *64) - ;; - *) - cat >&2 <<-'EOF' - Error: you are not using a 64bit platform. - Docker currently only supports 64bit platforms. - EOF - exit 1 - ;; - esac - - user="$(id -un 2>/dev/null || true)" - - sh_c='sh -c' - if [ "$user" != 'root' ]; then - if command_exists sudo; then - sh_c='sudo -E sh -c' - elif command_exists su; then - sh_c='su -c' - else - cat >&2 <<-'EOF' - Error: this installer needs the ability to run commands as root. - We are unable to find either "sudo" or "su" available to make this happen. - EOF - exit 1 - fi - fi - - curl='' - if command_exists curl; then - curl='curl -sSL' - elif command_exists wget; then - curl='wget -qO-' - elif command_exists busybox && busybox --list-modules | grep -q wget; then - curl='busybox wget -qO-' - fi - - # check to see which repo they are trying to install from - if [ -z "$repo" ]; then - repo='main' - if [ "https://test.docker.com/" = "$url" ]; then - repo='testing' - elif [ "https://experimental.docker.com/" = "$url" ]; then - repo='experimental' - fi - fi - - # perform some very rudimentary platform detection - lsb_dist='' - dist_version='' - if command_exists lsb_release; then - lsb_dist="$(lsb_release -si)" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then - lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then - lsb_dist='debian' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then - lsb_dist='fedora' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then - lsb_dist='oracleserver' - fi - if [ -z "$lsb_dist" ]; then - if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then - lsb_dist='centos' - fi - fi - if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then - lsb_dist="$(. /etc/os-release && echo "$ID")" - fi - - lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')" - - case "$lsb_dist" in - - ubuntu) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then - dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")" - fi - ;; - - debian) - dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" - case "$dist_version" in - 8) - dist_version="jessie" - ;; - 7) - dist_version="wheezy" - ;; - esac - ;; - - oracleserver) - # need to switch lsb_dist to match yum repo URL - lsb_dist="oraclelinux" - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - fedora|centos) - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - *) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then - dist_version="$(. /etc/os-release && echo "$VERSION_ID")" - fi - ;; - - - esac - - - # Run setup for each distro accordingly - case "$lsb_dist" in - ubuntu|debian) - export DEBIAN_FRONTEND=noninteractive - - did_apt_get_update= - apt_get_update() { - if [ -z "$did_apt_get_update" ]; then - ( set -x; $sh_c 'sleep 3; apt-get update' ) - did_apt_get_update=1 - fi - } - - # aufs is preferred over devicemapper; try to ensure the driver is available. - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then - kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual" - - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true - - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)' - echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!' - ( set -x; sleep 10 ) - fi - else - echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual' - echo >&2 ' package. We have no AUFS support. Consider installing the packages' - echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.' - ( set -x; sleep 10 ) - fi - fi - - # install apparmor utils if they're missing and apparmor is enabled in the kernel - # otherwise Docker will fail to start - if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then - if command -v apparmor_parser >/dev/null 2>&1; then - echo 'apparmor is enabled in the kernel and apparmor utils were already installed' - else - echo 'apparmor is enabled in the kernel, but apparmor_parser missing' - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' ) - fi - fi - - if [ ! -e /usr/lib/apt/methods/https ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' ) - fi - if [ -z "$curl" ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' ) - curl='curl -sSL' - fi - ( - set -x - for key_server in $key_servers ; do - $sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break - done - $sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null" - $sh_c "mkdir -p /etc/apt/sources.list.d" - $sh_c "echo deb [arch=$(dpkg --print-architecture)] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list" - $sh_c 'sleep 3; apt-get update' - if [ -z "$DOCKER_VERSION" ]; then - $sh_c 'apt-get -o Dpkg::Options::="--force-confnew" install -y -q docker-engine' - else - $sh_c "apt-get -o Dpkg::Options::=\"--force-confnew\" install -y -q docker-engine=$DOCKER_VERSION" - fi - ) - exit 0 - ;; - - fedora|centos|oraclelinux) - $sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF - [docker-${repo}-repo] - name=Docker ${repo} Repository - baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version} - enabled=1 - gpgcheck=1 - gpgkey=${yum_url}/gpg - EOF - if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then - ( - set -x - $sh_c 'sleep 3; dnf -y -q install docker-engine' - ) - else - ( - set -x - $sh_c 'sleep 3; yum -y -q install docker-engine' - ) - fi - exit 0 - ;; - gentoo) - if [ "$url" = "https://test.docker.com/" ]; then - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - You appear to be trying to install the latest nightly build in Gentoo.' - The portage tree should contain the latest stable release of Docker, but' - if you want something more recent, you can always use the live ebuild' - provided in the "docker" overlay available via layman. For more' - instructions, please see the following URL:' - - https://github.com/tianon/docker-overlay#using-this-overlay' - - After adding the "docker" overlay, you should be able to:' - - emerge -av =app-emulation/docker-9999' - - EOF - exit 1 - fi - - ( - set -x - $sh_c 'sleep 3; emerge app-emulation/docker' - ) - exit 0 - ;; - esac - - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - Either your platform is not easily detectable, is not supported by this - installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have - a package for Docker. Please visit the following URL for more detailed - installation instructions: - - https://docs.docker.com/engine/installation/ - - EOF - exit 1 -} - -# wrapped up in a function so that we have some protection against only getting -# half the file during "curl | sh" -do_install diff --git a/.travis/travis-after-success.sh b/.travis/travis-after-success.sh deleted file mode 100755 index 695358122..000000000 --- a/.travis/travis-after-success.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -if [[ $CODECOV == "true" ]]; then - codecov -fi - -if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]]; -then - cat <> ~/settings.xml - - - - ossrh - \${env.OSSRH_USER} - \${env.OSSRH_PASS} - - - -EOF - mvn deploy -DskipITs --settings ~/settings.xml - fi diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh deleted file mode 100755 index 88a1e0ecd..000000000 --- a/.travis/travis-before-install.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -SWARM_VERSION="${SWARM_VERSION:-}" -FAST_BUILD="${FAST_BUILD:-}" - -## fix coverity issue -sudo apt-get install -y -q ca-certificates -echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt -## - -if [ "$FAST_BUILD" == "true" ]; then - echo "Fast build, skipping docker installations." - exit 0 -fi - -set -exu - -sudo ip a ls -sudo ip r ls -sudo ss -antpl - -export HOST_PORT="2375" -export SWARM_PORT="2377" -export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" -# because of swarm use docker-engine directly -export PRE_DOCKER_HOST="$DOCKER_HOST" -export DOCKER_HOST="tcp://127.0.0.1:${HOST_PORT}" - - -docker info -docker version - -sudo -E apt-get update -sudo -E apt-get install -q -y wget -sudo -E apt-get -q -y --purge remove docker-engine -sudo -E apt-cache policy docker-engine - -./.travis/get-docker-com.sh - -sudo -E stop docker - -#mkdir "${HOME}/.cache" || : -#pushd "${HOME}/.cache" -# wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb" -# sudo apt-get -f install -# sudo dpkg -i "$(ls *${DOCKER_VERSION}*)" -#popd -rm -f "docker-java/src/test/resources/logback.xml" -#rm -f "src/test/resources/travis-logback.xml" -mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml" - -# https://github.com/docker/docker/issues/18113 -sudo rm /var/lib/docker/network/files/local-kv.db - -sudo cat /etc/default/docker - -cat << EOF | sudo tee /etc/default/docker -DOCKER_OPTS="\ ---dns 8.8.8.8 \ ---dns 8.8.4.4 \ --D \ --H=unix:///var/run/docker.sock \ --H=tcp://0.0.0.0:${HOST_PORT} \ ---label=com.github.dockerjava.test=docker-java \ -" -EOF - -sudo cat /etc/default/docker -sudo bash -c ':> /var/log/upstart/docker.log' - -date -sudo -E start docker - -tries=20 -sleep=5 -for i in $(seq 1 $tries); do - if sudo grep "API listen on" /var/log/upstart/docker.log ; then - echo "Docker started. Delay $(($i * $sleep))" - break - elif [[ $i -ge $tries ]]; then - echo "Docker didn't start. Exiting!" - sudo cat /var/log/upstart/docker.log - exit 1 - else - echo "Docker didn't start, sleeping for 5 secs..." - sleep $sleep - fi -done - - -sudo ss -antpl - -curl -V - -docker version || sudo cat /var/log/upstart/docker.log -docker info - -set +u - -cat < "${HOME}/.docker-java.properties" -registry.username=${registry_username} -registry.password=${registry_password} -registry.email=${registry_email} -registry.url=https://index.docker.io/v1/ - -EOF - -if [[ -n $SWARM_VERSION ]]; then -# export SWARM_PORT="${PRE_DOCKER_HOST##*:}" - - docker pull swarm - -# # kv store https://docs.docker.com/v1.11/engine/userguide/networking/get-started-overlay/ -# docker run -d \ -# -p "8500:8500" \ -# -h "consul" \ -# --name=consul \ -# progrium/consul -server -bootstrap -# -# sleep 5 - -# SWARM_TOKEN=$(docker run swarm c) - -# docker run \ -# -d \ -# --name=swarm_manager \ -# -p ${SWARM_PORT}:2375 \ -# "swarm:${SWARM_VERSION}" \ -# manage token://${SWARM_TOKEN} - - docker run \ - -d \ - -p ${SWARM_PORT}:2375 \ - --name=swarm_manager \ - swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}" -# swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "consul://${HOST_IP}:8500" - - # join engine to swarm - docker run \ - -d \ - "--name=swarm_join" \ - "swarm:${SWARM_VERSION}" \ - join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}" -# join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "token://${SWARM_TOKEN}" - - docker run --rm \ - "swarm:${SWARM_VERSION}" list "nodes://${HOST_IP}:${HOST_PORT}" - - docker ps -a - sudo ss -antpl - - sleep 30 - - docker logs swarm_join - docker logs swarm_manager -# docker logs consul - - # switch to swarm connection - DOCKER_HOST="$PRE_DOCKER_HOST" - - docker version - docker info - - NODES=$(docker info | grep "Nodes:" | awk '{ print $2 }') - if [[ $NODES -eq "0" ]]; then - echo "Swarm didn't connect" - exit 1 - fi - - # test via swarm - docker pull busybox -fi diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh deleted file mode 100755 index 1cdc84fa5..000000000 --- a/.travis/travis-script.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - - - -IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` - -export COVERITY_ALLOWED=true -# Verify upload is permitted -AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted` -if [ "$AUTH_RES" = "Access denied" ]; then - echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" - COVERITY_ALLOWED=false -else - AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"` - if [ "$AUTH" = "true" ]; then - echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" - else - WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"` - echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" - - COVERITY_ALLOWED=false - fi -fi - -set -ex - -if [ "${FAST_BUILD}" == "true" ]; then - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && - [ "$COVERITY" == "true" ] && - [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] && - [ "$COVERITY_ALLOWED" == "true" ]; then - export COVERITY_SCAN_BUILD_COMMAND="mvn package" - #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash - ./.travis/travisci_build_coverity_scan.sh - else - mvn package - fi -else - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && - [ "$COVERITY" == "true" ] && - [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] && - [ "$COVERITY_ALLOWED" == "true" ]; then - export COVERITY_SCAN_BUILD_COMMAND="mvn verify" - #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash - ./.travis/travisci_build_coverity_scan.sh - else - mvn verify - fi -fi diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh deleted file mode 100755 index 074d0a46f..000000000 --- a/.travis/travisci_build_coverity_scan.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -set -e - -# Environment check -echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m" -[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1 -[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1 -[ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1 -[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1 -[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1 - -PLATFORM=`uname` -TOOL_ARCHIVE=/tmp/coverity-cache/cov-analysis-${PLATFORM}.tgz -TOOL_URL=https://scan.coverity.com/download/${PLATFORM} -TOOL_BASE=/tmp/coverity-scan-analysis -UPLOAD_URL="https://scan.coverity.com/builds" -SCAN_URL="https://scan.coverity.com" - -# Do not run on pull requests -if [ "${TRAVIS_PULL_REQUEST}" = "true" ]; then - echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m" - exit 0 -fi - -# Verify this branch should run -IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` -if [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then - echo -e "\033[33;1mCoverity Scan configured to run on branch ${TRAVIS_BRANCH}\033[0m" -else - echo -e "\033[33;1mCoverity Scan NOT configured to run on branch ${TRAVIS_BRANCH}\033[0m" - exit 1 -fi - -# Verify upload is permitted -AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted` -if [ "$AUTH_RES" = "Access denied" ]; then - echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" - exit 1 -else - AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"` - if [ "$AUTH" = "true" ]; then - echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" - else - WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"` - echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" - - exit 1 - fi -fi - -mkdir -p /tmp/coverity-cache || : - -if [ ! -d $TOOL_BASE ]; then - - # verify that binary is right - if file $TOOL_ARCHIVE | grep HTML ; then - echo "Removing $TOOL_ARCHIVE" - rm -f $TOOL_ARCHIVE - fi - - # Download Coverity Scan Analysis Tool - if [ ! -e $TOOL_ARCHIVE ]; then - echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m" - wget -nv -N -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN" - fi - - # Extract Coverity Scan Analysis Tool - echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m" - mkdir -p $TOOL_BASE - pushd $TOOL_BASE - du -sh $TOOL_ARCHIVE - file $TOOL_ARCHIVE - file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || : - ls -la $TOOL_ARCHIVE - tar -xf $TOOL_ARCHIVE #|& grep -v "Ignoring unknown extended header keyword" - popd -fi - -TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'` -export PATH=$TOOL_DIR/bin:$PATH - -# Build -echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m" -COV_BUILD_OPTIONS="" -#COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85" -RESULTS_DIR="cov-int" -eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}" -COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND -cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1 - -# Upload results -echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m" -RESULTS_ARCHIVE=analysis-results.tgz -tar czf $RESULTS_ARCHIVE $RESULTS_DIR -SHA=`git rev-parse --short HEAD` - -echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m" -response=$(curl \ - --silent --write-out "\n%{http_code}\n" \ - --form project=$COVERITY_SCAN_PROJECT_NAME \ - --form token=$COVERITY_SCAN_TOKEN \ - --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \ - --form file=@$RESULTS_ARCHIVE \ - --form version=$SHA \ - --form description="Travis CI build" \ - $UPLOAD_URL) -status_code=$(echo "$response" | sed -n '$p') -if [ "$status_code" != "201" ]; then - TEXT=$(echo "$response" | sed '$d') - echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m" - exit 1 -fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 96a1b9d6e..5d344d93b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ Change Log === +## 3.2.0 +- **Changelog is not maintained in this file. Please follow git diff or github releases.** +- Library was split into multiple modules to get ability to choose transports. +Okhttp was added (say thanks to @bsideup). +- Various cleanup, tests de-duplication internally. Planned binary compatibility breakage was reverted by @testcontainers project, so migration should work smoothly. Please switch to non-deprecated methods. +- Appeared various new commands and Fields(command options for existing commands). + ## 3.1.2 - update unix-socket to 2.2.0 - Remove `JacksonJaxbJsonProvider` from `FiltersEncoder` @@ -294,7 +301,7 @@ v2.0.0 Release notes * Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, stats, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example. -* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath. +* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/main/src/test/resources/logback.xml) configuration file in the classpath. All changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..5072b0864 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,58 @@ +# Build with Maven + +#### Prerequisites: + +* Java min 1.8 +* Maven 3 + +Build and run integration tests as follows: + + $ mvn clean install + +If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests: + + $ mvn clean install -DskipITs + +By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java +client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: + + DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock" + +More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/ + +To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details): + + DOCKER_HOST=tcp://127.0.0.1:2375 + +For secure tls (https) communication: + + DOCKER_HOST=tcp://127.0.0.1:2376 + DOCKER_TLS_VERIFY=1 + DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2 + + +# Code Design + * Model is based on Objects and not primitives that allows nullify requests and have null values for data + that wasn't provided by docker daemon. + * For null safeness findbugs annotations are used. + ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something) + should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package. + ** Methods that can't return `null` must be annotated with `@Nonnull`. + ** The same for Arguments. + ** `@Nullable` must be used only for changing inherited (other typed) qualifier. + * Setters in builder style must be prefixed with `withXX`. + * All classes should provide `toString()` `equals()` and `hashCode()` defined methods. + * Javadocs + ** Provide full information on field: + *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`. + ** getters/setters should refernce to field `@see #$field`. + * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`. + +# Coding style + * Some initial styling already enforced with checkstyle. Please aim for consistency with the existing code. + +# Testing + * Unit tests for serder (serialization-deserialization). + * Integration tests for commands. + * If model object has builders, then fill it with data and compare by `equals()` with expected response + from docker daemon. If failed, then some fields mappings are wrong. \ No newline at end of file diff --git a/README.md b/README.md index de96156a5..b1fa9c89e 100644 --- a/README.md +++ b/README.md @@ -1,142 +1,9 @@ [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) -[![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) -[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references) -[![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177) -[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master) -[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE) - - +[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=main)](http://codecov.io/github/docker-java/docker-java?branch=master) +[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/main/LICENSE) # docker-java Java API client for [Docker](http://docs.docker.io/ "Docker") -The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries! - -Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java") - -[Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)
-[Wiki](https://github.com/docker-java/docker-java/wiki) - -## Build with Maven - -###### Prerequisites: - -* Java min 1.7 -* Maven 3 - -Build and run integration tests as follows: - - $ mvn clean install - -If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests: - - $ mvn clean install -DskipITs - -By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java -client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: - - DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock" - -More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/ - -To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details): - - DOCKER_HOST=tcp://127.0.0.1:2375 - -For secure tls (https) communication: - - DOCKER_HOST=tcp://127.0.0.1:2376 - DOCKER_TLS_VERIFY=1 - DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2 - -### Latest release version -Supports a subset of the Docker Remote API [v1.37](https://docs.docker.com/engine/api/v1.37/), Docker Server version since 1.12.6 - - - com.github.docker-java - docker-java - - 3.X.Y - - -### Latest development version -May contain new features while they are not released. - -You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/). - - - com.github.docker-java - docker-java - 3.X.Y-SNAPSHOT - - - -## Documentation - -For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command "Test cases") - -## Configuration - -There are a couple of configuration items, all of which have sensible defaults: - -* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock` -* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol) -* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification -* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`) -* `api.version` The API version, e.g. `1.23`. -* `registry.url` Your registry's address. -* `registry.username` Your registry username (required to push containers). -* `registry.password` Your registry password. -* `registry.email` Your registry email. - -There are three ways to configure, in descending order of precedence: - -#### Programmatic: -In your application, e.g. - - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withDockerHost("tcp://my-docker-host.tld:2376") - .withDockerTlsVerify(true) - .withDockerCertPath("/home/user/.docker/certs") - .withDockerConfig("/home/user/.docker") - .withApiVersion("1.30") // optional - .withRegistryUrl("https://index.docker.io/v1/") - .withRegistryUsername("dockeruser") - .withRegistryPassword("ilovedocker") - .withRegistryEmail("dockeruser@github.com") - .build(); - DockerClient docker = DockerClientBuilder.getInstance(config).build(); - -#### Properties (docker-java.properties) - - DOCKER_HOST=tcp://localhost:2376 - DOCKER_TLS_VERIFY=1 - DOCKER_CERT_PATH=/home/user/.docker/certs - DOCKER_CONFIG=/home/user/.docker - api.version=1.23 - registry.url=https://index.docker.io/v1/ - registry.username=dockeruser - registry.password=ilovedocker - registry.email=dockeruser@github.com - -##### System Properties: - - java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main - -##### System Environment - - export DOCKER_HOST=tcp://localhost:2376 - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH=/home/user/.docker/certs - export DOCKER_CONFIG=/home/user/.docker - -##### File System - -In `$HOME/.docker-java.properties` - -##### Class Path - -In the class path at `/docker-java.properties` - +# [Read the documentation here](docs/README.md) diff --git a/circle.sh b/circle.sh index c84ca3fe6..b5b7cdbb0 100755 --- a/circle.sh +++ b/circle.sh @@ -6,7 +6,7 @@ case "$1" in mkdir .docker cp $CIRCLE_PROJECT_REPONAME/etc/certs/* .docker - # configure docker deamon to use SSL and provide the path to the certificates + # configure docker daemon to use SSL and provide the path to the certificates docker_opts='DOCKER_OPTS="$DOCKER_OPTS -H tcp://127.0.0.1:2376 --tlsverify --tlscacert='$HOME'/.docker/ca.pem --tlscert='$HOME'/.docker/server-cert.pem --tlskey='$HOME'/.docker/server-key.pem"' sudo sh -c "echo '$docker_opts' >> /etc/default/docker" diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index b8b0af838..dda682ab1 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,22 +4,26 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 0-SNAPSHOT ../pom.xml docker-java-api - bundle + jar docker-java-api https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.api + + com.fasterxml.jackson.core - jackson-databind - ${jackson.version} + jackson-annotations + 2.20 @@ -38,9 +42,31 @@ org.projectlombok lombok - 1.18.10 + 1.18.38 provided + + + + org.junit.jupiter + junit-jupiter + 5.13.4 + test + + + + com.tngtech.archunit + archunit-junit5 + 1.4.1 + test + + + + com.tngtech.archunit + archunit + 0.18.0 + test + @@ -55,6 +81,22 @@ + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + com.github.dockerjava.api.command.UpdateContainerCmd#getCpuPeriod() + com.github.dockerjava.api.command.UpdateContainerCmd#withCpuPeriod(java.lang.Integer) + com.github.dockerjava.api.command.UpdateContainerCmd#getCpuQuota() + com.github.dockerjava.api.command.UpdateContainerCmd#withCpuQuota(java.lang.Integer) + com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs() + com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw() + + + + diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 7762be0a7..bf6acdee0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -6,9 +6,11 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -21,9 +23,11 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -31,6 +35,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -39,6 +44,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -47,15 +53,20 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -123,6 +134,8 @@ public interface DockerClient extends Closeable { */ LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream); + LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream); + SearchImagesCmd searchImagesCmd(@Nonnull String term); RemoveImageCmd removeImageCmd(@Nonnull String imageId); @@ -131,12 +144,20 @@ public interface DockerClient extends Closeable { InspectImageCmd inspectImageCmd(@Nonnull String imageId); + ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId); + /** * @param name * The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null. */ SaveImageCmd saveImageCmd(@Nonnull String name); + /** + * Command to download multiple images at once. + * @return command (builder) + */ + SaveImagesCmd saveImagesCmd(); + /** * * CONTAINER API * */ @@ -158,6 +179,8 @@ public interface DockerClient extends Closeable { ExecCreateCmd execCreateCmd(@Nonnull String containerId); + ResizeExecCmd resizeExecCmd(@Nonnull String execId); + InspectContainerCmd inspectContainerCmd(@Nonnull String containerId); RemoveContainerCmd removeContainerCmd(@Nonnull String containerId); @@ -211,6 +234,15 @@ public interface DockerClient extends Closeable { ContainerDiffCmd containerDiffCmd(@Nonnull String containerId); + /** + * Export the contents of a container's filesystem as a tar archive. + * + * @param containerId + * id of the container + * @return created command + */ + ExportContainerCmd exportContainerCmd(@Nonnull String containerId); + StopContainerCmd stopContainerCmd(@Nonnull String containerId); KillContainerCmd killContainerCmd(@Nonnull String containerId); @@ -235,6 +267,8 @@ public interface DockerClient extends Closeable { RestartContainerCmd restartContainerCmd(@Nonnull String containerId); + ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId); + CommitCmd commitCmd(@Nonnull String containerId); BuildImageCmd buildImageCmd(); @@ -325,6 +359,15 @@ public interface DockerClient extends Closeable { */ UpdateSwarmNodeCmd updateSwarmNodeCmd(); + /** + * Remove the swarm node + * + * @param swarmNodeId swarmNodeId + * @return the command + * @since 1.24 + */ + RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId); + /** * List nodes in swarm * @@ -422,12 +465,47 @@ public interface DockerClient extends Closeable { /** * Command to remove a secret + * + * @since {@link RemoteApiVersion#VERSION_1_25} * @param secretId secret id or secret name * @return command */ RemoveSecretCmd removeSecretCmd(String secretId); + /** + * Command to list all configs. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @return command + */ + ListConfigsCmd listConfigsCmd(); + + /** + * Command to create a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @return command + */ + CreateConfigCmd createConfigCmd(); + + /** + * Command to inspect a service + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @param configId config id or config name + * @return command + */ + InspectConfigCmd inspectConfigCmd(String configId); + + /** + * Command to remove a config + * @since {@link RemoteApiVersion#VERSION_1_30} + * @param configId config id or config name + * @return command + */ + RemoveConfigCmd removeConfigCmd(String configId); + @Override void close() throws IOException; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java new file mode 100644 index 000000000..da600bd4d --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -0,0 +1,539 @@ +package com.github.dockerjava.api; + +import com.github.dockerjava.api.command.AttachContainerCmd; +import com.github.dockerjava.api.command.AuthCmd; +import com.github.dockerjava.api.command.BuildImageCmd; +import com.github.dockerjava.api.command.CommitCmd; +import com.github.dockerjava.api.command.ConnectToNetworkCmd; +import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; +import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; +import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; +import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; +import com.github.dockerjava.api.command.CreateContainerCmd; +import com.github.dockerjava.api.command.CreateImageCmd; +import com.github.dockerjava.api.command.CreateNetworkCmd; +import com.github.dockerjava.api.command.CreateSecretCmd; +import com.github.dockerjava.api.command.CreateServiceCmd; +import com.github.dockerjava.api.command.CreateVolumeCmd; +import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; +import com.github.dockerjava.api.command.EventsCmd; +import com.github.dockerjava.api.command.ExecCreateCmd; +import com.github.dockerjava.api.command.ExecStartCmd; +import com.github.dockerjava.api.command.InfoCmd; +import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.command.InspectContainerCmd; +import com.github.dockerjava.api.command.InspectExecCmd; +import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; +import com.github.dockerjava.api.command.InspectNetworkCmd; +import com.github.dockerjava.api.command.InspectServiceCmd; +import com.github.dockerjava.api.command.InspectSwarmCmd; +import com.github.dockerjava.api.command.InspectVolumeCmd; +import com.github.dockerjava.api.command.JoinSwarmCmd; +import com.github.dockerjava.api.command.KillContainerCmd; +import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.command.ListContainersCmd; +import com.github.dockerjava.api.command.ListImagesCmd; +import com.github.dockerjava.api.command.ListNetworksCmd; +import com.github.dockerjava.api.command.ListSecretsCmd; +import com.github.dockerjava.api.command.ListServicesCmd; +import com.github.dockerjava.api.command.ListSwarmNodesCmd; +import com.github.dockerjava.api.command.ListTasksCmd; +import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; +import com.github.dockerjava.api.command.LoadImageCmd; +import com.github.dockerjava.api.command.LogContainerCmd; +import com.github.dockerjava.api.command.LogSwarmObjectCmd; +import com.github.dockerjava.api.command.PauseContainerCmd; +import com.github.dockerjava.api.command.PingCmd; +import com.github.dockerjava.api.command.PruneCmd; +import com.github.dockerjava.api.command.PullImageCmd; +import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.api.command.RemoveContainerCmd; +import com.github.dockerjava.api.command.RemoveImageCmd; +import com.github.dockerjava.api.command.RemoveNetworkCmd; +import com.github.dockerjava.api.command.RemoveSecretCmd; +import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; +import com.github.dockerjava.api.command.RemoveVolumeCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.api.command.RestartContainerCmd; +import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.api.command.SearchImagesCmd; +import com.github.dockerjava.api.command.StartContainerCmd; +import com.github.dockerjava.api.command.StatsCmd; +import com.github.dockerjava.api.command.StopContainerCmd; +import com.github.dockerjava.api.command.TagImageCmd; +import com.github.dockerjava.api.command.TopContainerCmd; +import com.github.dockerjava.api.command.UnpauseContainerCmd; +import com.github.dockerjava.api.command.UpdateContainerCmd; +import com.github.dockerjava.api.command.UpdateServiceCmd; +import com.github.dockerjava.api.command.UpdateSwarmCmd; +import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; +import com.github.dockerjava.api.command.VersionCmd; +import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.Identifier; +import com.github.dockerjava.api.model.PruneType; +import com.github.dockerjava.api.model.SecretSpec; +import com.github.dockerjava.api.model.ServiceSpec; +import com.github.dockerjava.api.model.SwarmSpec; + +import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * @apiNote implementations MUST override {{@link #getDockerClient()}} + * @implNote We're not using an abstract class here because we want + * Java compiler to force us to implement every {@link DockerClient}'s method, + * especially when new methods are added + */ +@SuppressWarnings("unused") +public class DockerClientDelegate implements DockerClient { + + protected DockerClient getDockerClient() { + throw new IllegalStateException("Implement me!"); + } + + @Override + public AuthConfig authConfig() throws DockerException { + return getDockerClient().authConfig(); + } + + @Override + public AuthCmd authCmd() { + return getDockerClient().authCmd(); + } + + @Override + public InfoCmd infoCmd() { + return getDockerClient().infoCmd(); + } + + @Override + public PingCmd pingCmd() { + return getDockerClient().pingCmd(); + } + + @Override + public VersionCmd versionCmd() { + return getDockerClient().versionCmd(); + } + + @Override + public PullImageCmd pullImageCmd(@Nonnull String repository) { + return getDockerClient().pullImageCmd(repository); + } + + @Override + public PushImageCmd pushImageCmd(@Nonnull String name) { + return getDockerClient().pushImageCmd(name); + } + + @Override + public PushImageCmd pushImageCmd(@Nonnull Identifier identifier) { + return getDockerClient().pushImageCmd(identifier); + } + + @Override + public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream) { + return getDockerClient().createImageCmd(repository, imageStream); + } + + @Override + public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) { + return getDockerClient().loadImageCmd(imageStream); + } + + @Override + public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) { + return getDockerClient().loadImageAsyncCmd(imageStream); + } + + @Override + public SearchImagesCmd searchImagesCmd(@Nonnull String term) { + return getDockerClient().searchImagesCmd(term); + } + + @Override + public RemoveImageCmd removeImageCmd(@Nonnull String imageId) { + return getDockerClient().removeImageCmd(imageId); + } + + @Override + public ListImagesCmd listImagesCmd() { + return getDockerClient().listImagesCmd(); + } + + @Override + public InspectImageCmd inspectImageCmd(@Nonnull String imageId) { + return getDockerClient().inspectImageCmd(imageId); + } + + @Override + public ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId) { + return getDockerClient().imageHistoryCmd(imageId); + } + + @Override + public SaveImageCmd saveImageCmd(@Nonnull String name) { + return getDockerClient().saveImageCmd(name); + } + + @Override + public SaveImagesCmd saveImagesCmd() { + return getDockerClient().saveImagesCmd(); + } + + @Override + public ListContainersCmd listContainersCmd() { + return getDockerClient().listContainersCmd(); + } + + @Override + public CreateContainerCmd createContainerCmd(@Nonnull String image) { + return getDockerClient().createContainerCmd(image); + } + + @Override + public StartContainerCmd startContainerCmd(@Nonnull String containerId) { + return getDockerClient().startContainerCmd(containerId); + } + + @Override + public ExecCreateCmd execCreateCmd(@Nonnull String containerId) { + return getDockerClient().execCreateCmd(containerId); + } + + @Override + public ResizeExecCmd resizeExecCmd(@Nonnull String execId) { + return getDockerClient().resizeExecCmd(execId); + } + + @Override + public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId) { + return getDockerClient().inspectContainerCmd(containerId); + } + + @Override + public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId) { + return getDockerClient().removeContainerCmd(containerId); + } + + @Override + public WaitContainerCmd waitContainerCmd(@Nonnull String containerId) { + return getDockerClient().waitContainerCmd(containerId); + } + + @Override + public AttachContainerCmd attachContainerCmd(@Nonnull String containerId) { + return getDockerClient().attachContainerCmd(containerId); + } + + @Override + public ExecStartCmd execStartCmd(@Nonnull String execId) { + return getDockerClient().execStartCmd(execId); + } + + @Override + public InspectExecCmd inspectExecCmd(@Nonnull String execId) { + return getDockerClient().inspectExecCmd(execId); + } + + @Override + public LogContainerCmd logContainerCmd(@Nonnull String containerId) { + return getDockerClient().logContainerCmd(containerId); + } + + @Override + public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) { + return getDockerClient().copyArchiveFromContainerCmd(containerId, resource); + } + + @Override + @Deprecated + public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) { + return getDockerClient().copyFileFromContainerCmd(containerId, resource); + } + + @Override + public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId) { + return getDockerClient().copyArchiveToContainerCmd(containerId); + } + + @Override + public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId) { + return getDockerClient().containerDiffCmd(containerId); + } + + @Override + public ExportContainerCmd exportContainerCmd(@Nonnull String containerId) { + return getDockerClient().exportContainerCmd(containerId); + } + + @Override + public StopContainerCmd stopContainerCmd(@Nonnull String containerId) { + return getDockerClient().stopContainerCmd(containerId); + } + + @Override + public KillContainerCmd killContainerCmd(@Nonnull String containerId) { + return getDockerClient().killContainerCmd(containerId); + } + + @Override + public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) { + return getDockerClient().updateContainerCmd(containerId); + } + + @Override + public RenameContainerCmd renameContainerCmd(@Nonnull String containerId) { + return getDockerClient().renameContainerCmd(containerId); + } + + @Override + public RestartContainerCmd restartContainerCmd(@Nonnull String containerId) { + return getDockerClient().restartContainerCmd(containerId); + } + + @Override + public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) { + return getDockerClient().resizeContainerCmd(containerId); + } + + @Override + public CommitCmd commitCmd(@Nonnull String containerId) { + return getDockerClient().commitCmd(containerId); + } + + @Override + public BuildImageCmd buildImageCmd() { + return getDockerClient().buildImageCmd(); + } + + @Override + public BuildImageCmd buildImageCmd(File dockerFileOrFolder) { + return getDockerClient().buildImageCmd(dockerFileOrFolder); + } + + @Override + public BuildImageCmd buildImageCmd(InputStream tarInputStream) { + return getDockerClient().buildImageCmd(tarInputStream); + } + + @Override + public TopContainerCmd topContainerCmd(String containerId) { + return getDockerClient().topContainerCmd(containerId); + } + + @Override + public TagImageCmd tagImageCmd(String imageId, String imageNameWithRepository, String tag) { + return getDockerClient().tagImageCmd(imageId, imageNameWithRepository, tag); + } + + @Override + public PauseContainerCmd pauseContainerCmd(String containerId) { + return getDockerClient().pauseContainerCmd(containerId); + } + + @Override + public UnpauseContainerCmd unpauseContainerCmd(String containerId) { + return getDockerClient().unpauseContainerCmd(containerId); + } + + @Override + public EventsCmd eventsCmd() { + return getDockerClient().eventsCmd(); + } + + @Override + public StatsCmd statsCmd(String containerId) { + return getDockerClient().statsCmd(containerId); + } + + @Override + public CreateVolumeCmd createVolumeCmd() { + return getDockerClient().createVolumeCmd(); + } + + @Override + public InspectVolumeCmd inspectVolumeCmd(String name) { + return getDockerClient().inspectVolumeCmd(name); + } + + @Override + public RemoveVolumeCmd removeVolumeCmd(String name) { + return getDockerClient().removeVolumeCmd(name); + } + + @Override + public ListVolumesCmd listVolumesCmd() { + return getDockerClient().listVolumesCmd(); + } + + @Override + public ListNetworksCmd listNetworksCmd() { + return getDockerClient().listNetworksCmd(); + } + + @Override + public InspectNetworkCmd inspectNetworkCmd() { + return getDockerClient().inspectNetworkCmd(); + } + + @Override + public CreateNetworkCmd createNetworkCmd() { + return getDockerClient().createNetworkCmd(); + } + + @Override + public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId) { + return getDockerClient().removeNetworkCmd(networkId); + } + + @Override + public ConnectToNetworkCmd connectToNetworkCmd() { + return getDockerClient().connectToNetworkCmd(); + } + + @Override + public DisconnectFromNetworkCmd disconnectFromNetworkCmd() { + return getDockerClient().disconnectFromNetworkCmd(); + } + + @Override + public InitializeSwarmCmd initializeSwarmCmd(SwarmSpec swarmSpec) { + return getDockerClient().initializeSwarmCmd(swarmSpec); + } + + @Override + public InspectSwarmCmd inspectSwarmCmd() { + return getDockerClient().inspectSwarmCmd(); + } + + @Override + public JoinSwarmCmd joinSwarmCmd() { + return getDockerClient().joinSwarmCmd(); + } + + @Override + public LeaveSwarmCmd leaveSwarmCmd() { + return getDockerClient().leaveSwarmCmd(); + } + + @Override + public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) { + return getDockerClient().updateSwarmCmd(swarmSpec); + } + + @Override + public UpdateSwarmNodeCmd updateSwarmNodeCmd() { + return getDockerClient().updateSwarmNodeCmd(); + } + + @Override + public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) { + return getDockerClient().removeSwarmNodeCmd(swarmNodeId); + } + + @Override + public ListSwarmNodesCmd listSwarmNodesCmd() { + return getDockerClient().listSwarmNodesCmd(); + } + + @Override + public ListServicesCmd listServicesCmd() { + return getDockerClient().listServicesCmd(); + } + + @Override + public CreateServiceCmd createServiceCmd(ServiceSpec serviceSpec) { + return getDockerClient().createServiceCmd(serviceSpec); + } + + @Override + public InspectServiceCmd inspectServiceCmd(String serviceId) { + return getDockerClient().inspectServiceCmd(serviceId); + } + + @Override + public UpdateServiceCmd updateServiceCmd(String serviceId, ServiceSpec serviceSpec) { + return getDockerClient().updateServiceCmd(serviceId, serviceSpec); + } + + @Override + public RemoveServiceCmd removeServiceCmd(String serviceId) { + return getDockerClient().removeServiceCmd(serviceId); + } + + @Override + public ListTasksCmd listTasksCmd() { + return getDockerClient().listTasksCmd(); + } + + @Override + public LogSwarmObjectCmd logServiceCmd(String serviceId) { + return getDockerClient().logServiceCmd(serviceId); + } + + @Override + public LogSwarmObjectCmd logTaskCmd(String taskId) { + return getDockerClient().logTaskCmd(taskId); + } + + @Override + public PruneCmd pruneCmd(PruneType pruneType) { + return getDockerClient().pruneCmd(pruneType); + } + + @Override + public ListSecretsCmd listSecretsCmd() { + return getDockerClient().listSecretsCmd(); + } + + @Override + public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) { + return getDockerClient().createSecretCmd(secretSpec); + } + + @Override + public RemoveSecretCmd removeSecretCmd(String secretId) { + return getDockerClient().removeSecretCmd(secretId); + } + + @Override + public ListConfigsCmd listConfigsCmd() { + return getDockerClient().listConfigsCmd(); + } + + @Override + public CreateConfigCmd createConfigCmd() { + return getDockerClient().createConfigCmd(); + } + + @Override + public InspectConfigCmd inspectConfigCmd(String configId) { + return getDockerClient().inspectConfigCmd(configId); + } + + @Override + public RemoveConfigCmd removeConfigCmd(String configId) { + return getDockerClient().removeConfigCmd(configId); + } + + @Override + public void close() throws IOException { + getDockerClient().close(); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java index 5b9fdb81c..6a244d620 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java @@ -6,6 +6,14 @@ * Result callback */ public interface ResultCallback extends Closeable { + + class Adapter extends ResultCallbackTemplate, A_RES_T> { + @Override + public void onNext(A_RES_T object) { + + } + } + /** * Called when the async processing starts respectively when the response arrives from the server. The passed {@link Closeable} can be * used to close/interrupt the processing. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java index 8c56ab093..911e67826 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java @@ -87,10 +87,18 @@ public void close() throws IOException { */ @SuppressWarnings("unchecked") public RC_T awaitCompletion() throws InterruptedException { - completed.await(); - // eventually (re)throws RuntimeException - throwFirstError(); - return (RC_T) this; + try { + completed.await(); + // eventually (re)throws RuntimeException + throwFirstError(); + return (RC_T) this; + } finally { + try { + close(); + } catch (IOException e) { + LOGGER.debug("Failed to close", e); + } + } } /** @@ -99,9 +107,17 @@ public RC_T awaitCompletion() throws InterruptedException { * before {@link ResultCallback#onComplete()} was called. */ public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException { - boolean result = completed.await(timeout, timeUnit); - throwFirstError(); - return result; + try { + boolean result = completed.await(timeout, timeUnit); + throwFirstError(); + return result; + } finally { + try { + close(); + } catch (IOException e) { + LOGGER.debug("Failed to close", e); + } + } } /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java index 3218a8419..b2f287cc2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java @@ -4,6 +4,7 @@ package com.github.dockerjava.api.command; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.async.ResultCallbackTemplate; /** * @@ -15,4 +16,7 @@ public interface AsyncDockerCmd, A_ > T exec(T resultCallback); + default ResultCallbackTemplate start() { + return exec(new ResultCallback.Adapter<>()); + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java index 9cf1da7aa..1b7b76a67 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java @@ -1,17 +1,16 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.BuildResponseItem; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; import java.io.File; import java.io.InputStream; import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; - /** * Build an image from Dockerfile. *

@@ -145,6 +144,12 @@ public interface BuildImageCmd extends AsyncDockerCmd getExtraHosts(); + // setters /** @@ -223,6 +228,16 @@ public interface BuildImageCmd extends AsyncDockerCmd extraHosts); + + @Override + default BuildImageResultCallback start() { + return exec(new BuildImageResultCallback()); + } + interface Exec extends DockerCmdAsyncExec { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java new file mode 100644 index 000000000..9db21a6c4 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java @@ -0,0 +1,80 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.BuildResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.TimeUnit; + +/** + * + * @author Marcus Linke + * + */ +public class BuildImageResultCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class); + + private String imageId; + + private String error; + + @Override + public void onNext(BuildResponseItem item) { + if (item.isBuildSuccessIndicated()) { + this.imageId = item.getImageId(); + } else if (item.isErrorIndicated()) { + this.error = item.getError(); + } + LOGGER.debug("{}", item); + } + + /** + * Awaits the image id from the response stream. + * + * @throws DockerClientException + * if the build fails. + */ + public String awaitImageId() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getImageId(); + } + + /** + * Awaits the image id from the response stream. + * + * @throws DockerClientException + * if the build fails or the timeout occurs. + */ + public String awaitImageId(long timeout, TimeUnit timeUnit) { + try { + awaitCompletion(timeout, timeUnit); + } catch (InterruptedException e) { + throw new DockerClientException("Awaiting image id interrupted: ", e); + } + + return getImageId(); + } + + private String getImageId() { + if (error != null) { + throw new DockerClientException("Could not build image: " + error); + } + + if (imageId != null) { + return imageId; + } + + throw new DockerClientException("Could not build image"); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java index a4dfb5c03..19b3c3843 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java @@ -16,6 +16,7 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd { boolean isDirChildrenOnly(); + boolean isCopyUIDGID(); /** * Set container's id * @@ -49,6 +50,14 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd { */ CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir); + /** + * If set to true then ownership is set to the user and primary group at the destination + * + * @param copyUIDGID + * flag to know if ownership should be set to the user and primary group at the destination + */ + CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID); + /** * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory. For ex: if * I have root/titi and root/tata and the remote path is /var/data. dirChildrenOnly = true will create /var/data/titi and /var/data/tata diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java new file mode 100644 index 000000000..205bc7a7d --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java @@ -0,0 +1,51 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.ConflictException; + +import javax.annotation.CheckForNull; +import java.util.Map; + +/** + * Command to create a new config + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public interface CreateConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getName(); + + @CheckForNull + String getData(); + + @CheckForNull + Map getLabels(); + + /** + * @param name + * - The new config name. + */ + CreateConfigCmd withName(String name); + + /** + * @param data + * - The new config data. + */ + CreateConfigCmd withData(byte[] data); + + /** + * @param labels + * - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects. + */ + CreateConfigCmd withLabels(Map labels); + + /** + * @throws ConflictException Named config already exists + */ + @Override + CreateConfigResponse exec() throws ConflictException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java new file mode 100644 index 000000000..5836275ff --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java @@ -0,0 +1,20 @@ +package com.github.dockerjava.api.command; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * The response of a {@link CreateConfigCmd} + */ +@EqualsAndHashCode +@ToString +public class CreateConfigResponse extends DockerObject { + @JsonProperty("ID") + private String id; + + public String getId() { + return id; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java index b24b40401..fba83f50c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; @@ -22,6 +23,9 @@ import javax.annotation.CheckForNull; import java.util.List; import java.util.Map; +import java.util.Objects; + +import static java.util.Objects.requireNonNull; public interface CreateContainerCmd extends SyncDockerCmd { @@ -40,15 +44,37 @@ public interface CreateContainerCmd extends SyncDockerCmd getAliases(); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull - Bind[] getBinds(); + @JsonIgnore + default Bind[] getBinds() { + return getHostConfig().getBinds(); + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withBinds(Bind... binds); + default CreateContainerCmd withBinds(Bind... binds) { + Objects.requireNonNull(binds, "binds was not specified"); + getHostConfig().setBinds(binds); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withBinds(List binds); + default CreateContainerCmd withBinds(List binds) { + Objects.requireNonNull(binds, "binds was not specified"); + return withBinds(binds.toArray(new Bind[binds.size()])); + } /** * Add network-scoped alias for the container @@ -144,21 +170,39 @@ public interface CreateContainerCmd extends SyncDockerCmd links); + default CreateContainerCmd withLinks(List links) { + requireNonNull(links, "links was not specified"); + return withLinks(links.toArray(new Link[links.size()])); + } @CheckForNull String getIpv6Address(); @@ -175,26 +219,63 @@ public interface CreateContainerCmd extends SyncDockerCmd'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system * services such as D-bus and is therefore considered insecure. * + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withNetworkMode(String networkMode); + default CreateContainerCmd withNetworkMode(String networkMode) { + Objects.requireNonNull(networkMode, "networkMode was not specified"); + getHostConfig().withNetworkMode(networkMode); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull - Ports getPortBindings(); + @JsonIgnore + default Ports getPortBindings() { + return getHostConfig().getPortBindings(); + } /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withPortBindings(PortBinding... portBindings); + default CreateContainerCmd withPortBindings(PortBinding... portBindings) { + Objects.requireNonNull(portBindings, "portBindings was not specified"); + getHostConfig().withPortBindings(new Ports(portBindings)); + return this; + } /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withPortBindings(List portBindings); + default CreateContainerCmd withPortBindings(List portBindings) { + Objects.requireNonNull(portBindings, "portBindings was not specified"); + return withPortBindings(portBindings.toArray(new PortBinding[0])); + } /** * Add the port bindings that are contained in the given {@link Ports} object. * - * @see #withPortBindings(PortBinding...) + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withPortBindings(Ports portBindings); + default CreateContainerCmd withPortBindings(Ports portBindings) { + Objects.requireNonNull(portBindings, "portBindings was not specified"); + getHostConfig().withPortBindings(portBindings); + return this; + } CreateContainerCmd withName(String name); @@ -244,12 +353,27 @@ public interface CreateContainerCmd extends SyncDockerCmd portSpecs); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull - Boolean getPrivileged(); + @JsonIgnore + default Boolean getPrivileged() { + return getHostConfig().getPrivileged(); + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withPrivileged(Boolean privileged); + default CreateContainerCmd withPrivileged(Boolean privileged) { + Objects.requireNonNull(privileged, "no privileged was specified"); + getHostConfig().withPrivileged(privileged); + return this; + } @CheckForNull String getUser(); @@ -263,15 +387,37 @@ public interface CreateContainerCmd extends SyncDockerCmd volumes); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull - VolumesFrom[] getVolumesFrom(); + @JsonIgnore + default VolumesFrom[] getVolumesFrom() { + return getHostConfig().getVolumesFrom(); + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom); + default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) { + Objects.requireNonNull(volumesFrom, "volumesFrom was not specified"); + getHostConfig().withVolumesFrom(volumesFrom); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withVolumesFrom(List volumesFrom); + default CreateContainerCmd withVolumesFrom(List volumesFrom) { + requireNonNull(volumesFrom, "volumesFrom was not specified"); + return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()])); + } @CheckForNull String getWorkingDir(); @@ -313,64 +459,133 @@ public interface CreateContainerCmd extends SyncDockerCmd extraHosts); + default CreateContainerCmd withExtraHosts(List extraHosts) { + requireNonNull(extraHosts, "extraHosts was not specified"); + return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()])); + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated - Capability[] getCapAdd(); + @JsonIgnore + default Capability[] getCapAdd() { + return getHostConfig().getCapAdd(); + } /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withCapAdd(Capability... capAdd); + default CreateContainerCmd withCapAdd(Capability... capAdd) { + requireNonNull(capAdd, "capAdd was not specified"); + getHostConfig().withCapAdd(capAdd); + return this; + } /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withCapAdd(List capAdd); + default CreateContainerCmd withCapAdd(List capAdd) { + requireNonNull(capAdd, "capAdd was not specified"); + return withCapAdd(capAdd.toArray(new Capability[capAdd.size()])); + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated - Capability[] getCapDrop(); + @JsonIgnore + default Capability[] getCapDrop() { + return getHostConfig().getCapDrop(); + } /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withCapDrop(Capability... capDrop); + default CreateContainerCmd withCapDrop(Capability... capDrop) { + requireNonNull(capDrop, "capDrop was not specified"); + getHostConfig().withCapDrop(capDrop); + return this; + } /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withCapDrop(List capDrop); + default CreateContainerCmd withCapDrop(List capDrop) { + requireNonNull(capDrop, "capDrop was not specified"); + return withCapDrop(capDrop.toArray(new Capability[capDrop.size()])); + } @CheckForNull @@ -386,156 +601,417 @@ public interface CreateContainerCmd extends SyncDockerCmd devices); + default CreateContainerCmd withDevices(List devices) { + getHostConfig().withDevices(devices); + return this; + } /** * Set custom DNS servers + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withDns(String... dns); + default CreateContainerCmd withDns(String... dns) { + getHostConfig().withDns(dns); + return this; + } /** * Set custom DNS servers + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withDns(List dns); + default CreateContainerCmd withDns(List dns) { + getHostConfig().withDns(dns); + return this; + } /** * Set custom DNS search domains + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withDnsSearch(String... dnsSearch); + default CreateContainerCmd withDnsSearch(String... dnsSearch) { + getHostConfig().withDnsSearch(dnsSearch); + return this; + } /** * Set custom DNS search domains + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withDnsSearch(List dnsSearch); + default CreateContainerCmd withDnsSearch(List dnsSearch) { + getHostConfig().withDnsSearch(dnsSearch); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withLogConfig(LogConfig logConfig); + default CreateContainerCmd withLogConfig(LogConfig logConfig) { + getHostConfig().withLogConfig(logConfig); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withLxcConf(LxcConf... lxcConf); + default CreateContainerCmd withLxcConf(LxcConf... lxcConf) { + getHostConfig().withLxcConf(lxcConf); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withLxcConf(List lxcConf); + default CreateContainerCmd withLxcConf(List lxcConf) { + getHostConfig().withLxcConf(lxcConf.toArray(new LxcConf[0])); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withOomKillDisable(Boolean oomKillDisable); + default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { + getHostConfig().withOomKillDisable(oomKillDisable); + return this; + } /** * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withPidMode(String pidMode); + default CreateContainerCmd withPidMode(String pidMode) { + getHostConfig().withPidMode(pidMode); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs); + default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { + getHostConfig().withReadonlyRootfs(readonlyRootfs); + return this; + } /** * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()} + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated - CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy); + default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { + getHostConfig().withRestartPolicy(restartPolicy); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withUlimits(Ulimit... ulimits); + @JsonIgnore + default CreateContainerCmd withUlimits(Ulimit... ulimits) { + getHostConfig().withUlimits(ulimits); + return this; + } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated - CreateContainerCmd withUlimits(List ulimits); + default CreateContainerCmd withUlimits(List ulimits) { + getHostConfig().withUlimits(ulimits); + return this; + } + + @CheckForNull + default String getPlatform() { + return null; + } + + CreateContainerCmd withPlatform(String platform); /** * @throws NotFoundException No such container diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java index b19f8c6ae..ad24d7ec8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class CreateContainerResponse { +public class CreateContainerResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java index 09b1929c0..53b2b5367 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class CreateImageResponse { +public class CreateImageResponse extends DockerObject { @JsonProperty("status") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java index 544ac2083..56b9df17a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java @@ -47,7 +47,7 @@ public interface CreateNetworkCmd extends SyncDockerCmd { /** Name of the network driver to use. Defaults to bridge. */ CreateNetworkCmd withDriver(String driver); - /** Ipam config, such es subnet, gateway and ip range of the network */ + /** Ipam config, such as subnet, gateway and ip range of the network */ CreateNetworkCmd withIpam(Ipam ipam); /** Driver specific options */ diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java index a816f3f3a..3f6f219e1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java @@ -1,12 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @EqualsAndHashCode @ToString -public class CreateNetworkResponse { +public class CreateNetworkResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java index c9da4c3ba..2c1b6f11b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +10,7 @@ */ @EqualsAndHashCode @ToString -public class CreateSecretResponse { +public class CreateSecretResponse extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java index dc78642e3..bfcce27ad 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.ServiceSpec; import javax.annotation.CheckForNull; @@ -15,8 +16,13 @@ public interface CreateServiceCmd extends SyncDockerCmd { @CheckForNull ServiceSpec getServiceSpec(); + @CheckForNull + AuthConfig getAuthConfig(); + CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec); + CreateServiceCmd withAuthConfig(AuthConfig authConfig); + /** * @throws ConflictException * Named service already exists diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java index 1cbd421b9..b68343f55 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +10,7 @@ */ @EqualsAndHashCode @ToString -public class CreateServiceResponse { +public class CreateServiceResponse extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java index 3d052033f..4a3ef9819 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java @@ -9,6 +9,9 @@ public interface CreateVolumeCmd extends SyncDockerCmd { @CheckForNull String getName(); + @CheckForNull + Map getLabels(); + @CheckForNull String getDriver(); @@ -21,6 +24,12 @@ public interface CreateVolumeCmd extends SyncDockerCmd { */ CreateVolumeCmd withName(String name); + /** + * @param labels + * - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects. + */ + CreateVolumeCmd withLabels(Map labels); + /** * @param driver * - Name of the volume driver to use. Defaults to local for the name. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java index a6dffb94d..4afc6f6ba 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java @@ -1,20 +1,26 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Map; + /** * * @author Marcus Linke */ @EqualsAndHashCode @ToString -public class CreateVolumeResponse { +public class CreateVolumeResponse extends DockerObject { @JsonProperty("Name") private String name; + @JsonProperty("Labels") + private Map labels; + @JsonProperty("Driver") private String driver; @@ -25,6 +31,10 @@ public String getName() { return name; } + public Map getLabels() { + return labels; + } + public String getDriver() { return driver; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java new file mode 100644 index 000000000..d7cdd97a9 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -0,0 +1,422 @@ +package com.github.dockerjava.api.command; + +import java.io.IOException; + +public class DelegatingDockerCmdExecFactory implements DockerCmdExecFactory { + + // We're not using abstract class because we want + // the compiler to force us to implement new DockerCmdExecFactory when added + public DockerCmdExecFactory getDockerCmdExecFactory() { + throw new IllegalStateException("Implement me!"); + } + + @Override + public AuthCmd.Exec createAuthCmdExec() { + return getDockerCmdExecFactory().createAuthCmdExec(); + } + + @Override + public InfoCmd.Exec createInfoCmdExec() { + return getDockerCmdExecFactory().createInfoCmdExec(); + } + + @Override + public PingCmd.Exec createPingCmdExec() { + return getDockerCmdExecFactory().createPingCmdExec(); + } + + @Override + public ResizeContainerCmd.Exec createResizeContainerCmdExec() { + return getDockerCmdExecFactory().createResizeContainerCmdExec(); + } + + @Override + public ExecCreateCmd.Exec createExecCmdExec() { + return getDockerCmdExecFactory().createExecCmdExec(); + } + + @Override + public ResizeExecCmd.Exec createResizeExecCmdExec() { + return getDockerCmdExecFactory().createResizeExecCmdExec(); + } + + @Override + public VersionCmd.Exec createVersionCmdExec() { + return getDockerCmdExecFactory().createVersionCmdExec(); + } + + @Override + public PullImageCmd.Exec createPullImageCmdExec() { + return getDockerCmdExecFactory().createPullImageCmdExec(); + } + + @Override + public PushImageCmd.Exec createPushImageCmdExec() { + return getDockerCmdExecFactory().createPushImageCmdExec(); + } + + @Override + public SaveImageCmd.Exec createSaveImageCmdExec() { + return getDockerCmdExecFactory().createSaveImageCmdExec(); + } + + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return getDockerCmdExecFactory().createSaveImagesCmdExec(); + } + + @Override + public CreateImageCmd.Exec createCreateImageCmdExec() { + return getDockerCmdExecFactory().createCreateImageCmdExec(); + } + + @Override + public LoadImageCmd.Exec createLoadImageCmdExec() { + return getDockerCmdExecFactory().createLoadImageCmdExec(); + } + + @Override + public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() { + return getDockerCmdExecFactory().createLoadImageAsyncCmdExec(); + } + + @Override + public SearchImagesCmd.Exec createSearchImagesCmdExec() { + return getDockerCmdExecFactory().createSearchImagesCmdExec(); + } + + @Override + public RemoveImageCmd.Exec createRemoveImageCmdExec() { + return getDockerCmdExecFactory().createRemoveImageCmdExec(); + } + + @Override + public ListImagesCmd.Exec createListImagesCmdExec() { + return getDockerCmdExecFactory().createListImagesCmdExec(); + } + + @Override + public InspectImageCmd.Exec createInspectImageCmdExec() { + return getDockerCmdExecFactory().createInspectImageCmdExec(); + } + + @Override + public ImageHistoryCmd.Exec createImageHistoryCmdExec() { + return getDockerCmdExecFactory().createImageHistoryCmdExec(); + } + + @Override + public ListContainersCmd.Exec createListContainersCmdExec() { + return getDockerCmdExecFactory().createListContainersCmdExec(); + } + + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + return getDockerCmdExecFactory().createCreateContainerCmdExec(); + } + + @Override + public StartContainerCmd.Exec createStartContainerCmdExec() { + return getDockerCmdExecFactory().createStartContainerCmdExec(); + } + + @Override + public InspectContainerCmd.Exec createInspectContainerCmdExec() { + return getDockerCmdExecFactory().createInspectContainerCmdExec(); + } + + @Override + public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { + return getDockerCmdExecFactory().createRemoveContainerCmdExec(); + } + + @Override + public WaitContainerCmd.Exec createWaitContainerCmdExec() { + return getDockerCmdExecFactory().createWaitContainerCmdExec(); + } + + @Override + public AttachContainerCmd.Exec createAttachContainerCmdExec() { + return getDockerCmdExecFactory().createAttachContainerCmdExec(); + } + + @Override + public ExecStartCmd.Exec createExecStartCmdExec() { + return getDockerCmdExecFactory().createExecStartCmdExec(); + } + + @Override + public InspectExecCmd.Exec createInspectExecCmdExec() { + return getDockerCmdExecFactory().createInspectExecCmdExec(); + } + + @Override + public LogContainerCmd.Exec createLogContainerCmdExec() { + return getDockerCmdExecFactory().createLogContainerCmdExec(); + } + + @Override + public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { + return getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(); + } + + @Override + public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { + return getDockerCmdExecFactory().createCopyArchiveFromContainerCmdExec(); + } + + @Override + public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { + return getDockerCmdExecFactory().createCopyArchiveToContainerCmdExec(); + } + + @Override + public StopContainerCmd.Exec createStopContainerCmdExec() { + return getDockerCmdExecFactory().createStopContainerCmdExec(); + } + + @Override + public ContainerDiffCmd.Exec createContainerDiffCmdExec() { + return getDockerCmdExecFactory().createContainerDiffCmdExec(); + } + + @Override + public ExportContainerCmd.Exec createExportContainerCmdExec() { + return getDockerCmdExecFactory().createExportContainerCmdExec(); + } + + @Override + public KillContainerCmd.Exec createKillContainerCmdExec() { + return getDockerCmdExecFactory().createKillContainerCmdExec(); + } + + @Override + public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { + return getDockerCmdExecFactory().createUpdateContainerCmdExec(); + } + + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec() { + return getDockerCmdExecFactory().createRenameContainerCmdExec(); + } + + @Override + public RestartContainerCmd.Exec createRestartContainerCmdExec() { + return getDockerCmdExecFactory().createRestartContainerCmdExec(); + } + + @Override + public CommitCmd.Exec createCommitCmdExec() { + return getDockerCmdExecFactory().createCommitCmdExec(); + } + + @Override + public BuildImageCmd.Exec createBuildImageCmdExec() { + return getDockerCmdExecFactory().createBuildImageCmdExec(); + } + + @Override + public TopContainerCmd.Exec createTopContainerCmdExec() { + return getDockerCmdExecFactory().createTopContainerCmdExec(); + } + + @Override + public TagImageCmd.Exec createTagImageCmdExec() { + return getDockerCmdExecFactory().createTagImageCmdExec(); + } + + @Override + public PauseContainerCmd.Exec createPauseContainerCmdExec() { + return getDockerCmdExecFactory().createPauseContainerCmdExec(); + } + + @Override + public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { + return getDockerCmdExecFactory().createUnpauseContainerCmdExec(); + } + + @Override + public EventsCmd.Exec createEventsCmdExec() { + return getDockerCmdExecFactory().createEventsCmdExec(); + } + + @Override + public StatsCmd.Exec createStatsCmdExec() { + return getDockerCmdExecFactory().createStatsCmdExec(); + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + return getDockerCmdExecFactory().createCreateVolumeCmdExec(); + } + + @Override + public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { + return getDockerCmdExecFactory().createInspectVolumeCmdExec(); + } + + @Override + public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { + return getDockerCmdExecFactory().createRemoveVolumeCmdExec(); + } + + @Override + public ListVolumesCmd.Exec createListVolumesCmdExec() { + return getDockerCmdExecFactory().createListVolumesCmdExec(); + } + + @Override + public ListNetworksCmd.Exec createListNetworksCmdExec() { + return getDockerCmdExecFactory().createListNetworksCmdExec(); + } + + @Override + public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { + return getDockerCmdExecFactory().createInspectNetworkCmdExec(); + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + return getDockerCmdExecFactory().createCreateNetworkCmdExec(); + } + + @Override + public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { + return getDockerCmdExecFactory().createRemoveNetworkCmdExec(); + } + + @Override + public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { + return getDockerCmdExecFactory().createConnectToNetworkCmdExec(); + } + + @Override + public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { + return getDockerCmdExecFactory().createDisconnectFromNetworkCmdExec(); + } + + @Override + public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { + return getDockerCmdExecFactory().createInitializeSwarmCmdExec(); + } + + @Override + public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { + return getDockerCmdExecFactory().createInspectSwarmCmdExec(); + } + + @Override + public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { + return getDockerCmdExecFactory().createJoinSwarmCmdExec(); + } + + @Override + public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { + return getDockerCmdExecFactory().createLeaveSwarmCmdExec(); + } + + @Override + public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { + return getDockerCmdExecFactory().createUpdateSwarmCmdExec(); + } + + @Override + public ListServicesCmd.Exec createListServicesCmdExec() { + return getDockerCmdExecFactory().createListServicesCmdExec(); + } + + @Override + public CreateServiceCmd.Exec createCreateServiceCmdExec() { + return getDockerCmdExecFactory().createCreateServiceCmdExec(); + } + + @Override + public InspectServiceCmd.Exec createInspectServiceCmdExec() { + return getDockerCmdExecFactory().createInspectServiceCmdExec(); + } + + @Override + public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { + return getDockerCmdExecFactory().createUpdateServiceCmdExec(); + } + + @Override + public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { + return getDockerCmdExecFactory().createRemoveServiceCmdExec(); + } + + @Override + public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { + return getDockerCmdExecFactory().logSwarmObjectExec(endpoint); + } + + @Override + public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { + return getDockerCmdExecFactory().listSwarmNodeCmdExec(); + } + + @Override + public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { + return getDockerCmdExecFactory().inspectSwarmNodeCmdExec(); + } + + @Override + public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { + return getDockerCmdExecFactory().removeSwarmNodeCmdExec(); + } + + @Override + public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { + return getDockerCmdExecFactory().updateSwarmNodeCmdExec(); + } + + @Override + public ListTasksCmd.Exec listTasksCmdExec() { + return getDockerCmdExecFactory().listTasksCmdExec(); + } + + @Override + public PruneCmd.Exec pruneCmdExec() { + return getDockerCmdExecFactory().pruneCmdExec(); + } + + @Override + public ListSecretsCmd.Exec createListSecretsCmdExec() { + return getDockerCmdExecFactory().createListSecretsCmdExec(); + } + + @Override + public CreateSecretCmd.Exec createCreateSecretCmdExec() { + return getDockerCmdExecFactory().createCreateSecretCmdExec(); + } + + @Override + public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { + return getDockerCmdExecFactory().createRemoveSecretCmdExec(); + } + + @Override + public ListConfigsCmd.Exec createListConfigsCmdExec() { + return getDockerCmdExecFactory().createListConfigsCmdExec(); + } + + @Override + public CreateConfigCmd.Exec createCreateConfigCmdExec() { + return getDockerCmdExecFactory().createCreateConfigCmdExec(); + } + + @Override + public InspectConfigCmd.Exec createInspectConfigCmdExec() { + return getDockerCmdExecFactory().createInspectConfigCmdExec(); + } + + @Override + public RemoveConfigCmd.Exec createRemoveConfigCmdExec() { + return getDockerCmdExecFactory().createRemoveConfigCmdExec(); + } + + @Override + public void close() throws IOException { + getDockerCmdExecFactory().close(); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index 06cf8eae0..bdf39269d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -21,10 +21,14 @@ public interface DockerCmdExecFactory extends Closeable { SaveImageCmd.Exec createSaveImageCmdExec(); + SaveImagesCmd.Exec createSaveImagesCmdExec(); + CreateImageCmd.Exec createCreateImageCmdExec(); LoadImageCmd.Exec createLoadImageCmdExec(); + LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec(); + SearchImagesCmd.Exec createSearchImagesCmdExec(); RemoveImageCmd.Exec createRemoveImageCmdExec(); @@ -33,6 +37,8 @@ public interface DockerCmdExecFactory extends Closeable { InspectImageCmd.Exec createInspectImageCmdExec(); + ImageHistoryCmd.Exec createImageHistoryCmdExec(); + ListContainersCmd.Exec createListContainersCmdExec(); CreateContainerCmd.Exec createCreateContainerCmdExec(); @@ -47,8 +53,12 @@ public interface DockerCmdExecFactory extends Closeable { AttachContainerCmd.Exec createAttachContainerCmdExec(); + ResizeContainerCmd.Exec createResizeContainerCmdExec(); + ExecStartCmd.Exec createExecStartCmdExec(); + ResizeExecCmd.Exec createResizeExecCmdExec(); + InspectExecCmd.Exec createInspectExecCmdExec(); LogContainerCmd.Exec createLogContainerCmdExec(); @@ -63,6 +73,8 @@ public interface DockerCmdExecFactory extends Closeable { ContainerDiffCmd.Exec createContainerDiffCmdExec(); + ExportContainerCmd.Exec createExportContainerCmdExec(); + KillContainerCmd.Exec createKillContainerCmdExec(); UpdateContainerCmd.Exec createUpdateContainerCmdExec(); @@ -230,6 +242,35 @@ public interface DockerCmdExecFactory extends Closeable { */ RemoveSecretCmd.Exec createRemoveSecretCmdExec(); + /** + * Command to list all configs. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + ListConfigsCmd.Exec createListConfigsCmdExec(); + + /** + * Command to inspect a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + InspectConfigCmd.Exec createInspectConfigCmdExec(); + + /** + * Command to create a new config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + CreateConfigCmd.Exec createCreateConfigCmdExec(); + + /** + * Command to remove a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + RemoveConfigCmd.Exec createRemoveConfigCmdExec(); + + @Override void close() throws IOException; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java index c52706226..34a0c5ad5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java @@ -2,10 +2,12 @@ import java.util.List; import java.util.Map; +import java.util.stream.Stream; import javax.annotation.CheckForNull; import com.github.dockerjava.api.model.Event; +import com.github.dockerjava.api.model.EventType; /** * Get events @@ -33,6 +35,24 @@ public interface EventsCmd extends AsyncDockerCmd { */ EventsCmd withEventFilter(String... event); + /** + * @param eventTypes event types to filter + */ + EventsCmd withEventTypeFilter(String... eventTypes); + + /** + * This provides a type safe version of {@link #withEventTypeFilter(String...)}. + * + * @param eventTypes event types to filter + */ + default EventsCmd withEventTypeFilter(EventType... eventTypes) { + return withEventTypeFilter( + Stream.of(eventTypes) + .map(EventType::getValue) + .toArray(String[]::new) + ); + } + /** * @param image * - image to filter diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java index e751896de..449803236 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java @@ -1,12 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @EqualsAndHashCode @ToString -public class ExecCreateCmdResponse { +public class ExecCreateCmdResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java new file mode 100644 index 000000000..bef73d261 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.api.command; + +import java.io.InputStream; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import com.github.dockerjava.api.exception.NotFoundException; + +/** + * Export the contents of a container as a tar archive. + */ +public interface ExportContainerCmd extends SyncDockerCmd { + + @CheckForNull + String getContainerId(); + + ExportContainerCmd withContainerId(@Nonnull String containerId); + + /** + * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks. + * + * @throws NotFoundException + * No such container + */ + @Override + InputStream exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java index 7852e8d59..44abc176d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class GraphData { +public class GraphData extends DockerObject { @JsonProperty("RootDir") private String rootDir; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java index 5ba4d456e..4d6679416 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class GraphDriver { +public class GraphDriver extends DockerObject { /** * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21} */ diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java index cd7290785..0d8e399c1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java @@ -1,9 +1,15 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.util.List; -public class HealthState { +@EqualsAndHashCode +@ToString +public class HealthState extends DockerObject { @JsonProperty("Status") private String status; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java index d68dcb74f..71939f872 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java @@ -1,8 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; +import lombok.EqualsAndHashCode; +import lombok.ToString; -public class HealthStateLog { +@EqualsAndHashCode +@ToString +public class HealthStateLog extends DockerObject { @JsonProperty("Start") private String start; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java new file mode 100644 index 000000000..d93796ad2 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.api.command; + +import java.util.List; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ImageHistory; + +/** + * Get the history of an image. + */ +public interface ImageHistoryCmd extends SyncDockerCmd> { + + @CheckForNull + String getImageId(); + + ImageHistoryCmd withImageId(@Nonnull String imageId); + + /** + * @throws NotFoundException + * No such image + */ + @Override + List exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec> { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java new file mode 100644 index 000000000..96374d795 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java @@ -0,0 +1,25 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Config; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface InspectConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getConfigId(); + + InspectConfigCmd withConfigId(@Nonnull String configId); + + /** + * @throws NotFoundException + * No such config + */ + @Override + Config exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 06e18fa21..f06bd4ed9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; +import com.github.dockerjava.api.model.DockerObject; import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.NetworkSettings; import com.github.dockerjava.api.model.Volume; @@ -24,7 +25,7 @@ */ @EqualsAndHashCode @ToString -public class InspectContainerResponse { +public class InspectContainerResponse extends DockerObject { @JsonProperty("Args") private String[] args; @@ -60,7 +61,10 @@ public class InspectContainerResponse { private String id; @JsonProperty("SizeRootFs") - private Integer sizeRootFs; + private Long sizeRootFs; + + @JsonProperty("SizeRw") + private Long sizeRw; @JsonProperty("Image") private String imageId; @@ -120,10 +124,14 @@ public String getId() { return id; } - public Integer getSizeRootFs() { + public Long getSizeRootFs() { return sizeRootFs; } + public Long getSizeRw() { + return sizeRw; + } + public String getCreated() { return created; } @@ -251,7 +259,7 @@ public String getPlatform() { @EqualsAndHashCode @ToString - public class ContainerState { + public class ContainerState extends DockerObject { /** * @since {@link RemoteApiVersion#VERSION_1_20} @@ -456,7 +464,7 @@ public HealthState getHealth() { @EqualsAndHashCode @ToString - public static class Mount { + public static class Mount extends DockerObject { /** * @since {@link RemoteApiVersion#VERSION_1_20} @@ -581,7 +589,7 @@ public Mount withSource(String source) { @EqualsAndHashCode @ToString - public class Node { + public class Node extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java index 06d904dc8..307fdd873 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java @@ -3,6 +3,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import com.github.dockerjava.api.model.NetworkSettings; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ @EqualsAndHashCode @ToString -public class InspectExecResponse { +public class InspectExecResponse extends DockerObject { @JsonProperty("ID") private String id; @@ -152,7 +153,7 @@ public Long getPidLong() { @EqualsAndHashCode @ToString - public class ProcessConfig { + public class ProcessConfig extends DockerObject { @JsonProperty("arguments") private List arguments; @@ -190,7 +191,9 @@ public String getUser() { } } - public class Container { + @EqualsAndHashCode + @ToString + public class Container extends DockerObject { @JsonProperty("NetworkSettings") private NetworkSettings networkSettings; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java index b8590bfc6..bf48ba8f0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class InspectImageResponse { +public class InspectImageResponse extends DockerObject { @JsonProperty("Architecture") private String arch; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java index 020e0f9ae..bc0008817 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java @@ -1,30 +1,43 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Map; + /** * * @author Marcus Linke */ @EqualsAndHashCode @ToString -public class InspectVolumeResponse { +public class InspectVolumeResponse extends DockerObject { @JsonProperty("Name") private String name; + @JsonProperty("Labels") + private Map labels; + @JsonProperty("Driver") private String driver; @JsonProperty("Mountpoint") private String mountpoint; + @JsonProperty("Options") + private Map options; + public String getName() { return name; } + public Map getLabels() { + return labels; + } + public String getDriver() { return driver; } @@ -32,4 +45,9 @@ public String getDriver() { public String getMountpoint() { return mountpoint; } + + public Map getOptions() { + return options; + } + } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java new file mode 100644 index 000000000..38d34816a --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java @@ -0,0 +1,21 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.Config; + +import java.util.List; +import java.util.Map; + +/** + * Command to list all configs in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public interface ListConfigsCmd extends SyncDockerCmd> { + + Map> getFilters(); + + ListConfigsCmd withFilters(Map> filters); + + interface Exec extends DockerCmdSyncExec> { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java index 7741df743..99a9fc200 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -25,6 +26,11 @@ public interface ListImagesCmd extends SyncDockerCmd> { */ ListImagesCmd withShowAll(Boolean showAll); + /** + * Filter images by name + * @deprecated use {@link #withFilter(String, Collection)} + */ + @Deprecated ListImagesCmd withImageNameFilter(String imageName); /** @@ -44,6 +50,15 @@ public interface ListImagesCmd extends SyncDockerCmd> { */ ListImagesCmd withLabelFilter(Map labels); + /** + * Filter images by reference + * + * @param reference string in the form {@code [:]} + */ + ListImagesCmd withReferenceFilter(String reference); + + ListImagesCmd withFilter(String key, Collection values); + interface Exec extends DockerCmdSyncExec> { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java index 4e1b449f8..7c434a48d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java @@ -3,6 +3,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ListVolumesResponse { +public class ListVolumesResponse extends DockerObject { @JsonProperty("Volumes") private List volumes; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java new file mode 100644 index 000000000..4f054db22 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java @@ -0,0 +1,22 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.LoadResponseItem; + +import java.io.InputStream; + +public interface LoadImageAsyncCmd extends AsyncDockerCmd { + InputStream getImageStream(); + + /** + * @param imageStream the InputStream of the tar file + */ + LoadImageAsyncCmd withImageStream(InputStream imageStream); + + @Override + default LoadImageCallback start() { + return exec(new LoadImageCallback()); + } + + interface Exec extends DockerCmdAsyncExec { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java new file mode 100644 index 000000000..80cca18de --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java @@ -0,0 +1,49 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.LoadResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LoadImageCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCallback.class); + + private String message; + + private String error; + + @Override + public void onNext(LoadResponseItem item) { + if (item.isBuildSuccessIndicated()) { + this.message = item.getMessage(); + } else if (item.isErrorIndicated()) { + this.error = item.getError(); + } + + LOGGER.debug("{}", item); + } + + public String awaitMessage() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getMessage(); + } + + private String getMessage() { + if (this.message != null) { + return this.message; + } + + if (this.error == null) { + throw new DockerClientException("Could not build image"); + } + + throw new DockerClientException("Could not build image: " + this.error); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java index 53674cbaa..29c4516cd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java @@ -25,6 +25,8 @@ * @param since * - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: * 0 (unfiltered) + * @param until + * - Only return logs before this time, as a UNIX timestamp. Default: 0 */ public interface LogContainerCmd extends AsyncDockerCmd { @@ -49,6 +51,9 @@ public interface LogContainerCmd extends AsyncDockerCmd @CheckForNull Integer getSince(); + @CheckForNull + Integer getUntil(); + LogContainerCmd withContainerId(@Nonnull String containerId); /** @@ -69,6 +74,8 @@ public interface LogContainerCmd extends AsyncDockerCmd LogContainerCmd withSince(Integer since); + LogContainerCmd withUntil(Integer until); + /** * @throws com.github.dockerjava.api.NotFoundException * No such container diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java index cc95161a5..d86bddfe3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PullResponseItem; @@ -41,6 +42,11 @@ public interface PullImageCmd extends AsyncDockerCmd start() { + return exec(new PullImageResultCallback()); + } + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java new file mode 100644 index 000000000..5980ce3df --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java @@ -0,0 +1,115 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.PullResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.CheckForNull; +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author Marcus Linke + * + */ +public class PullImageResultCallback extends ResultCallback.Adapter { + + private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class); + + private boolean isSwarm = false; + private Map results = null; + + @CheckForNull + private PullResponseItem latestItem = null; + + @Override + public void onNext(PullResponseItem item) { + // only do it once + if (results == null && latestItem == null) { + checkForDockerSwarmResponse(item); + } + + if (isSwarm) { + handleDockerSwarmResponse(item); + } else { + handleDockerClientResponse(item); + } + + LOGGER.debug("{}", item); + } + + private void checkForDockerSwarmResponse(PullResponseItem item) { + if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) { + isSwarm = true; + LOGGER.debug("Communicating with Docker Swarm."); + } + } + + private void handleDockerSwarmResponse(final PullResponseItem item) { + if (results == null) { + results = new HashMap<>(); + } + + // Swarm terminates a pull sometimes with an empty line. + // Therefore keep first success message + PullResponseItem currentItem = results.get(item.getId()); + if (currentItem == null || !currentItem.isPullSuccessIndicated()) { + results.put(item.getId(), item); + } + } + + private void handleDockerClientResponse(PullResponseItem item) { + latestItem = item; + } + + private void checkDockerSwarmPullSuccessful() { + if (results.isEmpty()) { + throw new DockerClientException("Could not pull image through Docker Swarm"); + } else { + boolean pullFailed = false; + StringBuilder sb = new StringBuilder(); + + for (PullResponseItem pullResponseItem : results.values()) { + if (!pullResponseItem.isPullSuccessIndicated()) { + pullFailed = true; + sb.append("[" + pullResponseItem.getId() + ":" + messageFromPullResult(pullResponseItem) + "]"); + } + } + + if (pullFailed) { + throw new DockerClientException("Could not pull image: " + sb.toString()); + } + } + } + + private void checkDockerClientPullSuccessful() { + if (latestItem == null) { + return; + } + + if (!latestItem.isPullSuccessIndicated()) { + throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem)); + } + } + + private String messageFromPullResult(PullResponseItem pullResponseItem) { + return (pullResponseItem.getError() != null) ? pullResponseItem.getError() : pullResponseItem.getStatus(); + } + + @Override + protected void throwFirstError() { + super.throwFirstError(); + + if (isSwarm) { + checkDockerSwarmPullSuccessful(); + } else { + checkDockerClientPullSuccessful(); + } + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java index abd86c53c..01f9d0567 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java @@ -2,8 +2,10 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PushResponseItem; @@ -46,6 +48,31 @@ public interface PushImageCmd extends AsyncDockerCmd> T exec(T resultCallback); + @Override + default ResultCallback.Adapter start() { + return exec(new ResultCallback.Adapter() { + + @Nullable + private PushResponseItem latestItem = null; + + @Override + public void onNext(PushResponseItem item) { + this.latestItem = item; + } + + @Override + protected void throwFirstError() { + super.throwFirstError(); + + if (latestItem == null) { + throw new DockerClientException("Could not push image"); + } else if (latestItem.isErrorIndicated()) { + throw new DockerClientException("Could not push image: " + latestItem.getError()); + } + } + }); + } + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java new file mode 100644 index 000000000..741fe32c0 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java @@ -0,0 +1,28 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +/** + * Remove a config. + */ +public interface RemoveConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getConfigId(); + + RemoveConfigCmd withConfigId(@Nonnull String secretId); + + /** + * @throws NotFoundException + * No such config + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java index 198e7b8df..603c610b3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java @@ -18,7 +18,7 @@ public interface RemoveSwarmNodeCmd extends SyncDockerCmd { @CheckForNull Boolean hasForceEnabled(); - RemoveSwarmNodeCmd withContainerId(@Nonnull String containerId); + RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId); RemoveSwarmNodeCmd withForce(Boolean force); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java new file mode 100644 index 000000000..fef0087ed --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface ResizeContainerCmd extends SyncDockerCmd { + + @CheckForNull + String getContainerId(); + + Integer getHeight(); + + Integer getWidth(); + + ResizeContainerCmd withContainerId(@Nonnull String execId); + + ResizeContainerCmd withSize(int height, int width); + + /** + * @throws NotFoundException no such container instance + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java new file mode 100644 index 000000000..5910705e0 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java @@ -0,0 +1,29 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface ResizeExecCmd extends SyncDockerCmd { + @CheckForNull + String getExecId(); + + Integer getHeight(); + + Integer getWidth(); + + ResizeExecCmd withExecId(@Nonnull String execId); + + ResizeExecCmd withSize(int height, int width); + + /** + * @throws NotFoundException no such exec instance + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java index 5dcc59c24..372456813 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java @@ -8,9 +8,8 @@ /** * Restart a running container. * - * @param timeout - * - Timeout in seconds before killing the container. Defaults to 10 seconds. - * + * @param signal - Signal to send to the container as an integer or string (e.g. SIGINT). + * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds. */ public interface RestartContainerCmd extends SyncDockerCmd { @@ -20,13 +19,28 @@ public interface RestartContainerCmd extends SyncDockerCmd { @CheckForNull Integer getTimeout(); + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_42} + */ + @CheckForNull + String getSignal(); + RestartContainerCmd withContainerId(@Nonnull String containerId); - RestartContainerCmd withtTimeout(Integer timeout); + /** + * @deprecated wrong name, use {@link #withTimeout(Integer)} + */ + @Deprecated + default RestartContainerCmd withtTimeout(Integer timeout) { + return withTimeout(timeout); + } + + RestartContainerCmd withTimeout(Integer timeout); + + RestartContainerCmd withSignal(String signal); /** - * @throws NotFoundException - * No such container + * @throws NotFoundException No such container */ @Override Void exec() throws NotFoundException; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java index e4cc0ec54..c190852af 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class RootFS { +public class RootFS extends DockerObject { @JsonProperty("Type") private String type; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java new file mode 100644 index 000000000..1dd504434 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java @@ -0,0 +1,47 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.Nonnull; +import java.io.InputStream; +import java.util.List; + +/** Command for downloading multiple images at once. */ +public interface SaveImagesCmd extends SyncDockerCmd { + + /** Image name and tag. */ + interface TaggedImage { + + /** + * The (tagged) image name. + * @return "name:tag" if a tag was specified, otherwise "name" + */ + String asString(); + } + + /** + * Adds an image to the list of images to download. + * @param name image name (not null) + * @param tag tag + * @return this + */ + SaveImagesCmd withImage(@Nonnull String name, @Nonnull String tag); + + + /** + * Gets the images that were added by {@link #withImage(String, String)}. + * @return images to be downloaded + */ + List getImages(); + + /** + * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks. + * + * @throws NotFoundException no such image + */ + InputStream exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java index 2bc87cc73..8dc38ee3e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java @@ -18,8 +18,10 @@ public interface SearchImagesCmd extends SyncDockerCmd> { @CheckForNull String getTerm(); + Integer getLimit(); SearchImagesCmd withTerm(@Nonnull String term); + SearchImagesCmd withLimit(@Nonnull Integer limit); interface Exec extends DockerCmdSyncExec> { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java index 6085a810b..c85ca2b2f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java @@ -16,6 +16,11 @@ public interface StatsCmd extends AsyncDockerCmd { StatsCmd withContainerId(@Nonnull String containerId); + @CheckForNull + Boolean hasNoStream(); + + StatsCmd withNoStream(boolean noStream); + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java index 6f7b1d49f..e604c20ae 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class TopContainerResponse { +public class TopContainerResponse extends DockerObject { @JsonProperty("Titles") private String[] titles; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java index 82fbca5f8..d53bcdcdf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java @@ -1,9 +1,16 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.model.BlkioRateDevice; +import com.github.dockerjava.api.model.BlkioWeightDevice; +import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DeviceRequest; +import com.github.dockerjava.api.model.RestartPolicy; +import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.UpdateContainerResponse; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import java.util.List; /** * @author Kanstantsin Shautsou @@ -13,22 +20,47 @@ public interface UpdateContainerCmd extends SyncDockerCmd getBlkioWeightDevice(); + + UpdateContainerCmd withBlkioWeightDevice(List blkioWeightDevice); @CheckForNull - Integer getCpuPeriod(); + List getBlkioDeviceReadBps(); - UpdateContainerCmd withCpuPeriod(Integer cpuPeriod); + UpdateContainerCmd withBlkioDeviceReadBps(List blkioDeviceReadBps); @CheckForNull - Integer getCpuQuota(); + List getBlkioDeviceWriteBps(); - UpdateContainerCmd withCpuQuota(Integer cpuQuota); + UpdateContainerCmd withBlkioDeviceWriteBps(List blkioDeviceWriteBps); + + @CheckForNull + List getBlkioDeviceReadIOps(); + + UpdateContainerCmd withBlkioDeviceReadIOps(List blkioDeviceReadIOps); + + @CheckForNull + List getBlkioDeviceWriteIOps(); + + UpdateContainerCmd withBlkioDeviceWriteIOps(List blkioDeviceWriteIOps); + + @CheckForNull + Long getCpuPeriod(); + + UpdateContainerCmd withCpuPeriod(Long cpuPeriod); + + @CheckForNull + Long getCpuQuota(); + + UpdateContainerCmd withCpuQuota(Long cpuQuota); @CheckForNull String getCpusetCpus(); @@ -45,6 +77,31 @@ public interface UpdateContainerCmd extends SyncDockerCmd getDevices(); + + UpdateContainerCmd withDevices(List devices); + + @CheckForNull + List getDeviceCgroupRules(); + + UpdateContainerCmd withDeviceCgroupRules(List deviceCgroupRules); + + @CheckForNull + List getDeviceRequests(); + + UpdateContainerCmd withDeviceRequests(List deviceRequests); + @CheckForNull Long getKernelMemory(); @@ -65,6 +122,36 @@ public interface UpdateContainerCmd extends SyncDockerCmd getUlimits(); + + UpdateContainerCmd withUlimits(List ulimits); + + @CheckForNull + RestartPolicy getRestartPolicy(); + + UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy); + interface Exec extends DockerCmdSyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java index daa4e5d3c..7b910cd69 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java @@ -2,9 +2,11 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; /** @@ -20,12 +22,29 @@ public interface WaitContainerCmd extends AsyncDockerCmd> T exec(T resultCallback); + @Override + default WaitContainerResultCallback start() { + return exec(new WaitContainerResultCallback()); + } + interface Exec extends DockerCmdAsyncExec { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java new file mode 100644 index 000000000..6cb160151 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java @@ -0,0 +1,74 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.WaitResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.CheckForNull; +import java.util.concurrent.TimeUnit; + +/** + * + * @author Marcus Linke + * + */ +public class WaitContainerResultCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class); + + @CheckForNull + private WaitResponse waitResponse = null; + + @Override + public void onNext(WaitResponse waitResponse) { + this.waitResponse = waitResponse; + LOGGER.debug("{}", waitResponse); + } + + /** + * Awaits the status code from the container. + * + * @throws DockerClientException + * if the wait operation fails. + */ + public Integer awaitStatusCode() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getStatusCode(); + } + + /** + * Awaits the status code from the container. + * + * @throws DockerClientException + * if the wait operation fails. + */ + public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) { + try { + if (!awaitCompletion(timeout, timeUnit)) { + throw new DockerClientException("Awaiting status code timeout."); + } + } catch (InterruptedException e) { + throw new DockerClientException("Awaiting status code interrupted: ", e); + } + + return getStatusCode(); + } + + private Integer getStatusCode() { + if (waitResponse == null) { + throw new DockerClientException("Error while wait container"); + } else { + return waitResponse.getStatusCode(); + } + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java index 5b511ff96..69baf047e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java @@ -13,12 +13,13 @@ public class DockerException extends RuntimeException { private int httpStatus = 0; public DockerException(String message, int httpStatus) { - super(message); + super(String.format("Status %d: %s", httpStatus, message)); this.httpStatus = httpStatus; } public DockerException(String message, int httpStatus, Throwable cause) { - super(message, cause); + super(String.format("Status %d: %s", httpStatus, message), cause); + this.httpStatus = httpStatus; } public int getHttpStatus() { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java index 1b6a01ea1..cbb108571 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java @@ -8,8 +8,8 @@ import java.io.Serializable; @EqualsAndHashCode -@ToString -public class AuthConfig implements Serializable { +@ToString(onlyExplicitlyIncluded = true) +public class AuthConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** @@ -20,15 +20,18 @@ public class AuthConfig implements Serializable { public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/"; @JsonProperty("username") + @ToString.Include private String username; @JsonProperty("password") private String password; @JsonProperty("email") + @ToString.Include private String email; @JsonProperty("serveraddress") + @ToString.Include private String registryAddress = DEFAULT_SERVER_ADDRESS; @JsonProperty("auth") @@ -50,6 +53,7 @@ public class AuthConfig implements Serializable { * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25} */ @JsonProperty("stackOrchestrator") + @ToString.Include private String stackOrchestrator; public String getUsername() { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java index baa8fc0b4..cbb7240f4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java @@ -5,8 +5,12 @@ import java.util.TreeMap; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; -public class AuthConfigurations implements Serializable { +@EqualsAndHashCode +@ToString +public class AuthConfigurations extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("configs") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java index 89069fe54..0703cab68 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java @@ -1,18 +1,23 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.io.Serializable; -public class AuthResponse implements Serializable { +@EqualsAndHashCode +@ToString(onlyExplicitlyIncluded = true) +public class AuthResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** * @since 1.23 */ @JsonProperty("Status") + @ToString.Include private String status; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java index c9aecf9d4..ea7c22e69 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -9,7 +10,8 @@ * The Bind can be in read only or read write access mode. */ @EqualsAndHashCode -public class Bind implements Serializable { +@ToString +public class Bind extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private String path; @@ -97,7 +99,8 @@ public PropagationMode getPropagationMode() { */ public static Bind parse(String serialized) { try { - String[] parts = serialized.split(":"); + // Split by ':' but not ':\' (Windows-style path) + String[] parts = serialized.split(":(?!\\\\)"); switch (parts.length) { case 2: { return new Bind(parts[0], new Volume(parts[1])); @@ -115,10 +118,16 @@ public static Bind parse(String serialized) { nocopy = true; } else if (PropagationMode.SHARED.toString().equals(p)) { propagationMode = PropagationMode.SHARED; + } else if (PropagationMode.RSHARED.toString().equals(p)) { + propagationMode = PropagationMode.RSHARED; } else if (PropagationMode.SLAVE.toString().equals(p)) { propagationMode = PropagationMode.SLAVE; + } else if (PropagationMode.RSLAVE.toString().equals(p)) { + propagationMode = PropagationMode.RSLAVE; } else if (PropagationMode.PRIVATE.toString().equals(p)) { propagationMode = PropagationMode.PRIVATE; + } else if (PropagationMode.RPRIVATE.toString().equals(p)) { + propagationMode = PropagationMode.RPRIVATE; } else { seMode = SELContext.fromString(p); } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java index 340921f01..801e7719a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class BindOptions implements Serializable { +public class BindOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java index a7957a945..06aff4ecf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java @@ -1,25 +1,11 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = Binds.Serializer.class) -@JsonDeserialize(using = Binds.Deserializer.class) public class Binds implements Serializable { private static final long serialVersionUID = 1L; @@ -33,39 +19,16 @@ public Bind[] getBinds() { return binds; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Binds binds, JsonGenerator jsonGen, SerializerProvider serProvider) throws IOException, - JsonProcessingException { - - // - jsonGen.writeStartArray(); - for (Bind bind : binds.getBinds()) { - jsonGen.writeString(bind.toString()); - } - jsonGen.writeEndArray(); - // - } - + @JsonValue + public String[] toPrimitive() { + return Stream.of(binds).map(Bind::toString).toArray(String[]::new); } - public static class Deserializer extends JsonDeserializer { - @Override - public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List binds = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator it = node.elements(); it.hasNext();) { - - JsonNode field = it.next(); - binds.add(Bind.parse(field.asText())); - - } - return new Binds(binds.toArray(new Bind[0])); - } + @JsonCreator + public static Binds fromPrimitive(String[] binds) { + return new Binds( + Stream.of(binds).map(Bind::parse).toArray(Bind[]::new) + ); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java index e26fc0d6f..300bcbf24 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java @@ -8,7 +8,7 @@ @EqualsAndHashCode @ToString -public class BlkioRateDevice implements Serializable { +public class BlkioRateDevice extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java index d47b2fe42..2fccabaa2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class BlkioStatEntry implements Serializable { +public class BlkioStatEntry extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("major") Long major; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java index 55479d024..5a7db4d8b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class BlkioStatsConfig implements Serializable { +public class BlkioStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("io_service_bytes_recursive") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java index 24b4d87f5..3fd9704d8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java @@ -8,7 +8,7 @@ @EqualsAndHashCode @ToString -public class BlkioWeightDevice implements Serializable { +public class BlkioWeightDevice extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java index b781bac9f..80356e55c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java @@ -1,14 +1,19 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.EqualsAndHashCode; +import lombok.ToString; /** * Represents a build response stream item */ +@EqualsAndHashCode +@ToString public class BuildResponseItem extends ResponseItem { private static final long serialVersionUID = -1252904184236343612L; private static final String BUILD_SUCCESS = "Successfully built"; + private static final String SHA256 = "sha256:"; /** * Returns whether the stream field indicates a successful build operation @@ -19,7 +24,7 @@ public boolean isBuildSuccessIndicated() { return false; } - return getStream().contains(BUILD_SUCCESS); + return getStream().contains(BUILD_SUCCESS) || getStream().startsWith(SHA256); } @JsonIgnore @@ -28,6 +33,10 @@ public String getImageId() { return null; } + if (getStream().startsWith(SHA256)) { + return getStream().replaceFirst(SHA256, "").trim(); + } + return getStream().replaceFirst(BUILD_SUCCESS, "").trim(); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java index 6237a65ae..57fb97c7b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java @@ -1,5 +1,7 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.annotation.JsonCreator; + /** * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually. * @@ -18,6 +20,10 @@ public enum Capability { * */ AUDIT_CONTROL, + /** + * Allow reading the audit log via multicast netlink socket. + */ + AUDIT_READ, /** * Write records to kernel auditing log. */ @@ -26,6 +32,14 @@ public enum Capability { * Employ features that can block system suspend. */ BLOCK_SUSPEND, + /** + * Allow creating BPF maps, loading BPF Type Format (BTF) data, retrieve JITed code of BPF programs, and more. + */ + BPF, + /** + * Allow checkpoint/restore related operations. Introduced in kernel 5.9. + */ + CHECKPOINT_RESTORE, /** * Make arbitrary changes to file UIDs and GIDs (see chown(2)). */ @@ -120,6 +134,10 @@ public enum Capability { * */ NET_RAW, + /** + * Allow system performance and observability privileged operations using perf_events, i915_perf and other kernel subsystems + */ + PERFMON, /** * Set file capabilities. */ @@ -283,5 +301,11 @@ public enum Capability { /** * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers). */ - WAKE_ALARM + WAKE_ALARM; + + @JsonCreator + public static Capability fromValue(String cap) { + String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1]; + return Capability.valueOf(result); + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java index 922e2e2b3..c8a5be890 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ChangeLog implements Serializable { +public class ChangeLog extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java index 40055106b..b6e1e5566 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ClusterInfo implements Serializable { +public class ClusterInfo extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java new file mode 100644 index 000000000..2c5b87aa8 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java @@ -0,0 +1,90 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * Used for Listing config. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +@ToString +@EqualsAndHashCode +public class Config extends DockerObject implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * @since 1.30 + */ + @JsonProperty("ID") + private String id; + + /** + * @since 1.30 + */ + @JsonProperty("CreatedAt") + private Date createdAt; + + /** + * @since 1.30 + */ + @JsonProperty("UpdatedAt") + private Date updatedAt; + + /** + * @since 1.30 + */ + @JsonProperty("Spec") + private ConfigSpec spec; + + /** + * @since 1.30 + */ + @JsonProperty("Version") + private ResourceVersion version; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public ConfigSpec getSpec() { + return spec; + } + + public void setSpec(ConfigSpec spec) { + this.spec = spec; + } + + public ResourceVersion getVersion() { + return version; + } + + public void setVersion(ResourceVersion version) { + this.version = version; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java new file mode 100644 index 000000000..62e525d0b --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java @@ -0,0 +1,24 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +@EqualsAndHashCode +@ToString +public class ConfigSpec extends DockerObject implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonProperty("Name") + private String name; + + public String getName() { + return name; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java index e2723a96b..3b4bdf394 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class Container implements Serializable { +public class Container extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Command") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java index a84835277..db5437220 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerConfig implements Serializable { +public class ContainerConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("AttachStderr") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java index c60414f81..63d3cae11 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerDNSConfig implements Serializable { +public class ContainerDNSConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Nameservers") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java index 590d22a92..cdc446282 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerHostConfig implements Serializable { +public class ContainerHostConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("NetworkMode") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java index 48b4c9f47..a08a6ea3f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerMount implements Serializable { +public class ContainerMount extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") @@ -106,7 +106,7 @@ public ContainerMount withDriver(String driver) { */ @CheckForNull public String getMode() { - return driver; + return mode; } /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java index 52acf4c77..823828900 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java @@ -20,7 +20,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerNetwork implements Serializable { +public class ContainerNetwork extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** @@ -283,7 +283,10 @@ public ContainerNetwork withNetworkID(String networkID) { /** * Docker named it EndpointIPAMConfig */ - public static class Ipam { + @EqualsAndHashCode + @ToString + public static class Ipam extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("IPv4Address") private String ipv4Address; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java index 19e249e29..9e8381500 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerNetworkSettings implements Serializable { +public class ContainerNetworkSettings extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java index b22aecc0e..35f9f6ab9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerPort implements Serializable { +public class ContainerPort extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("IP") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java index f56399ce8..0a26e54fd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpec implements Serializable { +public class ContainerSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** @@ -137,7 +137,7 @@ public class ContainerSpec implements Serializable { * @since 1.26 * A test to perform to check that the container is healthy. */ - @JsonProperty("HealthCheck") + @JsonProperty("Healthcheck") private HealthCheck healthCheck; /** @@ -161,6 +161,14 @@ public class ContainerSpec implements Serializable { @JsonProperty("Configs") private List configs; + /** + * @since 1.38 + * Run an init inside the container that forwards signals and reaps processes. + * This field is omitted if empty, and the default (as configured on the daemon) is used. + */ + @JsonProperty("Init") + private Boolean init; + /** * @see #image */ @@ -435,4 +443,13 @@ public ContainerSpec withConfigs(List configs) { this.configs = configs; return this; } + + public Boolean getInit() { + return init; + } + + public ContainerSpec withInit(Boolean init) { + this.init = init; + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java index 274ad8f55..fbd93b606 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecConfig implements Serializable { +public class ContainerSpecConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("File") private ContainerSpecFile file; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java index cf8471d7c..ac9ef4d81 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecFile implements Serializable { +public class ContainerSpecFile extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java index a5bb69391..5d8d7cd55 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivileges implements Serializable { +public class ContainerSpecPrivileges extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("CredentialSpec") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java index 8a4294f01..e6ca62fd4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivilegesCredential implements Serializable { +public class ContainerSpecPrivilegesCredential extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java index c7fa68af8..d1b2cc15b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivilegesSELinuxContext implements Serializable { +public class ContainerSpecPrivilegesSELinuxContext extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Disable") private Boolean disable; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java index e92b2b07f..742272e16 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecSecret implements Serializable { +public class ContainerSpecSecret extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("File") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java index fce6e610d..04d91c826 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,7 +12,9 @@ * * @author Yuting Liu */ -public class CpuStatsConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class CpuStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("cpu_usage") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java index e9e4d2212..f87afeec8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -11,7 +13,9 @@ * * @author Yuting Liu */ -public class CpuUsageConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class CpuUsageConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("total_usage") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java index 09223e52a..b6f16029e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java @@ -14,7 +14,7 @@ @EqualsAndHashCode @ToString -public class Device implements Serializable { +public class Device extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("CgroupPermissions") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java new file mode 100644 index 000000000..549d51b57 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java @@ -0,0 +1,75 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +@EqualsAndHashCode +@ToString +public class DeviceRequest extends DockerObject implements Serializable { + public static final long serialVersionUID = 1L; + + @JsonProperty("Driver") + private String driver; + + @JsonProperty("Count") + private Integer count; + + @JsonProperty("DeviceIDs") + private List deviceIds; + + @JsonProperty("Capabilities") + private List> capabilities; + + @JsonProperty("Options") + private Map options; + + public String getDriver() { + return driver; + } + + public DeviceRequest withDriver(String driver) { + this.driver = driver; + return this; + } + + public Integer getCount() { + return count; + } + + public DeviceRequest withCount(Integer count) { + this.count = count; + return this; + } + + public List getDeviceIds() { + return deviceIds; + } + + public DeviceRequest withDeviceIds(List deviceIds) { + this.deviceIds = deviceIds; + return this; + } + + public List> getCapabilities() { + return capabilities; + } + + public DeviceRequest withCapabilities(List> capabilities) { + this.capabilities = capabilities; + return this; + } + + public Map getOptions() { + return options; + } + + public DeviceRequest withOptions(Map options) { + this.options = options; + return this; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java index 0771fb180..80feee509 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java @@ -2,6 +2,7 @@ import java.io.Serializable; +@Deprecated public class DiscreteResourceSpec extends GenericResource implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java new file mode 100644 index 000000000..463dc15a1 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java @@ -0,0 +1,20 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @see DockerObjectAccessor + */ +public abstract class DockerObject { + + HashMap rawValues = new HashMap<>(); + + @JsonAnyGetter + public Map getRawValues() { + return Collections.unmodifiableMap(this.rawValues); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java new file mode 100644 index 000000000..0827c4a34 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java @@ -0,0 +1,27 @@ +package com.github.dockerjava.api.model; + +import java.util.HashMap; + +public final class DockerObjectAccessor { + + /** + * @deprecated not for public usage, unless you _really_ understand what you're doing + */ + @Deprecated + public static void overrideRawValues(DockerObject o, HashMap rawValues) { + o.rawValues = rawValues != null ? rawValues : new HashMap<>(); + } + + /** + * This is an advanced method for setting raw values on the resulting object + * that will fully overwrite any previously set value for given key. + * + * Make sure to check Docker's API before using it. + */ + public static void overrideRawValue(DockerObject o, String key, Object value) { + o.rawValues.put(key, value); + } + + private DockerObjectAccessor() { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java index cde23cb2b..bdc05e53b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Driver implements Serializable { +public class Driver extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java index cca52f1d0..57fe32247 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class DriverStatus implements Serializable { +public class DriverStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Root Dir") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java index eb6c982ed..cebbfea1c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Endpoint implements Serializable { +public class Endpoint extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java index 75b5056f0..c0ce386fa 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class EndpointSpec implements Serializable { +public class EndpointSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java index fad960fb7..0babfba4c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class EndpointVirtualIP implements Serializable { +public class EndpointVirtualIP extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java index 10c3310d1..63e670772 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public class ErrorDetail implements Serializable { +@EqualsAndHashCode +@ToString +public class ErrorDetail extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java index ef4f93eb1..523a35729 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java @@ -4,6 +4,7 @@ import java.io.Serializable; +@Deprecated public class ErrorResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java index 59ecc67bd..0eedbc553 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Event implements Serializable { +public class Event extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java index e05414d34..fbcf088f7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class EventActor implements Serializable { +public class EventActor extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java index 697c1e429..b7c64ecc5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java @@ -11,6 +11,7 @@ * @since 1.24 */ public enum EventType { + CONFIG("config"), /** * @since 1.24 */ @@ -26,7 +27,10 @@ public enum EventType { */ IMAGE("image"), NETWORK("network"), + NODE("node"), PLUGIN("plugin"), + SECRET("secret"), + SERVICE("service"), VOLUME("volume"); private static final Map EVENT_TYPES = new HashMap<>(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java index 1d0ac8bc8..4226fd94b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java @@ -2,23 +2,12 @@ import static com.github.dockerjava.api.model.InternetProtocol.TCP; import static com.github.dockerjava.api.model.InternetProtocol.UDP; +import static com.github.dockerjava.api.model.InternetProtocol.SCTP; -import java.io.IOException; import java.io.Serializable; -import java.util.Map.Entry; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.github.dockerjava.api.model.Ports.Binding; import lombok.EqualsAndHashCode; @@ -27,8 +16,6 @@ * {@link InternetProtocol}. It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding} it to a host port, * represented by a {@link Binding}. */ -@JsonDeserialize(using = ExposedPort.Deserializer.class) -@JsonSerialize(using = ExposedPort.Serializer.class) @EqualsAndHashCode public class ExposedPort implements Serializable { private static final long serialVersionUID = 1L; @@ -64,7 +51,7 @@ public ExposedPort(int port) { * Creates an {@link ExposedPort} for the given parameters. * * @param scheme - * the {@link #getScheme() scheme}, tcp or udp + * the {@link #getScheme() scheme}, tcp, udp or sctp * @param port * the {@link #getPort() port number} * @deprecated use {@link #ExposedPort(int, InternetProtocol)} @@ -82,7 +69,7 @@ public InternetProtocol getProtocol() { } /** - * @return the scheme (internet protocol), tcp or udp + * @return the scheme (internet protocol), tcp, udp or sctp * @deprecated use {@link #getProtocol()} */ @Deprecated @@ -111,6 +98,14 @@ public static ExposedPort udp(int port) { return new ExposedPort(port, UDP); } + /** + * Creates an {@link ExposedPort} for {@link InternetProtocol#SCTP}. This is a shortcut for + * new ExposedPort(port, {@link InternetProtocol#SCTP}) + */ + public static ExposedPort sctp(int port) { + return new ExposedPort(port, SCTP); + } + /** * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}. * @@ -120,6 +115,7 @@ public static ExposedPort udp(int port) { * @throws IllegalArgumentException * if the specification cannot be parsed */ + @JsonCreator public static ExposedPort parse(String serialized) throws IllegalArgumentException { try { String[] parts = serialized.split("/"); @@ -143,36 +139,8 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti * @return a string representation of this {@link ExposedPort} */ @Override + @JsonValue public String toString() { return port + "/" + protocol.toString(); } - - public static class Deserializer extends JsonDeserializer { - @Override - public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - if (!node.equals(NullNode.getInstance())) { - Entry field = node.fields().next(); - return ExposedPort.parse(field.getKey()); - } else { - return null; - } - } - } - - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - jsonGen.writeFieldName(exposedPort.toString()); - jsonGen.writeEndObject(); - } - - } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java index c20e84cec..6f5ae9ebd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java @@ -1,27 +1,16 @@ package com.github.dockerjava.api.model; -import java.io.IOException; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; + import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; - -@JsonSerialize(using = ExposedPorts.Serializer.class) -@JsonDeserialize(using = ExposedPorts.Deserializer.class) +@ToString public class ExposedPorts implements Serializable { private static final long serialVersionUID = 1L; @@ -39,40 +28,20 @@ public ExposedPort[] getExposedPorts() { return exposedPorts; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) { - jsonGen.writeFieldName(exposedPort.toString()); - jsonGen.writeStartObject(); - jsonGen.writeEndObject(); - } - jsonGen.writeEndObject(); - } - + @JsonCreator + public static ExposedPorts fromPrimitive(Map object) { + return new ExposedPorts( + object.keySet().stream().map(ExposedPort::parse).toArray(ExposedPort[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - @Override - public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List exposedPorts = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - - Map.Entry field = it.next(); - if (!field.getValue().equals(NullNode.getInstance())) { - exposedPorts.add(ExposedPort.parse(field.getKey())); - } - } - return new ExposedPorts(exposedPorts.toArray(new ExposedPort[0])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(exposedPorts).collect(Collectors.toMap( + ExposedPort::toString, + __ -> new Object(), + (a, b) -> a + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java index 95a80eb03..3a68410d8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ExternalCA implements Serializable { +public class ExternalCA extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java index 041e22423..fdd5dd62e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java @@ -8,7 +8,7 @@ * Represents a logging frame. */ @EqualsAndHashCode -public class Frame implements Serializable { +public class Frame extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final StreamType streamType; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java index 9b994d8dd..f6ddfabe5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public abstract class GenericResource implements Serializable { +@EqualsAndHashCode +@ToString +public abstract class GenericResource extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Kind") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java index e21a0763f..0e41b873f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java @@ -28,7 +28,7 @@ */ @EqualsAndHashCode @ToString -public class HealthCheck implements Serializable { +public class HealthCheck extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Interval") @@ -55,6 +55,12 @@ public class HealthCheck implements Serializable { @JsonProperty("StartPeriod") private Long startPeriod; + /** + * @since 1.44 + */ + @JsonProperty("StartInterval") + private Long startInterval; + public Long getInterval() { return interval; } @@ -63,11 +69,19 @@ public Long getTimeout() { return timeout; } + /** + * Set interval in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withInterval(Long interval) { this.interval = interval; return this; } + /** + * Set timeout in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withTimeout(Long timeout) { this.timeout = timeout; return this; @@ -95,8 +109,25 @@ public Long getStartPeriod() { return startPeriod; } + /** + * Set startPeriod in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withStartPeriod(Long startPeriod) { this.startPeriod = startPeriod; return this; } + + public Long getStartInterval() { + return startInterval; + } + + /** + * Set startInterval in nanoseconds + * @return this {@link HealthCheck} instance + */ + public HealthCheck withStartInterval(Long startInterval) { + this.startInterval = startInterval; + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index bcae9a4cc..603bc6347 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -19,7 +19,7 @@ */ @EqualsAndHashCode @ToString -public class HostConfig implements Serializable { +public class HostConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private static final List PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none"); @@ -70,9 +70,12 @@ public static HostConfig newHostConfig() { @JsonProperty("MemorySwappiness") private Long memorySwappiness; - @JsonProperty("NanoCPUs") + @JsonProperty("NanoCpus") private Long nanoCPUs; + @JsonProperty("Annotations") + private Map annotations; + @JsonProperty("CapAdd") private Capability[] capAdd; @@ -112,6 +115,12 @@ public static HostConfig newHostConfig() { @JsonProperty("DeviceCgroupRules") private List deviceCgroupRules; + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40} + */ + @JsonProperty("DeviceRequests") + private List deviceRequests; + /** * @since {@link RemoteApiVersion#VERSION_1_25} */ @@ -286,6 +295,9 @@ public static HostConfig newHostConfig() { @JsonProperty("ConsoleSize") private List consoleSize; + @JsonProperty("CgroupnsMode") + private String cgroupnsMode; + @JsonIgnore public Bind[] getBinds() { return (binds == null) ? new Bind[0] : binds.getBinds(); @@ -295,6 +307,11 @@ public Integer getBlkioWeight() { return blkioWeight; } + @CheckForNull + public Map getAnnotations() { + return annotations; + } + public Capability[] getCapAdd() { return capAdd; } @@ -627,6 +644,11 @@ public HostConfig withBlkioWeightDevice(List blkioWeightDevic return this; } + public HostConfig withAnnotations(Map annotations) { + this.annotations = annotations; + return this; + } + /** * @see #capAdd */ @@ -839,6 +861,7 @@ public HostConfig withMemorySwappiness(Long memorySwappiness) { *

  • 'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system * services such as D-bus and is therefore considered insecure.
    • * + * Any other value is interpreted as a custom network's name for this container to connect to. */ public HostConfig withNetworkMode(String networkMode) { this.networkMode = networkMode; @@ -1037,6 +1060,16 @@ public HostConfig withDeviceCgroupRules(List deviceCgroupRules) { return this; } + @CheckForNull + public List getDeviceRequests() { + return deviceRequests; + } + + public HostConfig withDeviceRequests(List deviceRequests) { + this.deviceRequests = deviceRequests; + return this; + } + @CheckForNull public Long getNanoCPUs() { return nanoCPUs; @@ -1177,6 +1210,16 @@ public HostConfig withUsernsMode(String usernsMode) { return this; } + @CheckForNull + public String getCgroupnsMode() { + return cgroupnsMode; + } + + public HostConfig withCgroupnsMode(String cgroupnsMode) { + this.cgroupnsMode = cgroupnsMode; + return this; + } + @CheckForNull public Map getSysctls() { return sysctls; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java index c214a8b16..a690548b4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class Identifier implements Serializable { +public class Identifier extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; public final Repository repository; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java index e6552eb35..732dcfe4f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java @@ -1,10 +1,12 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.EqualsAndHashCode; import lombok.ToString; import java.io.Serializable; +import java.util.Map; /** * @@ -13,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class Image implements Serializable { +public class Image extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Created") @@ -28,12 +30,24 @@ public class Image implements Serializable { @JsonProperty("RepoTags") private String[] repoTags; + @JsonProperty("RepoDigests") + private String[] repoDigests; + @JsonProperty("Size") private Long size; @JsonProperty("VirtualSize") private Long virtualSize; + @JsonProperty("SharedSize") + private Long sharedSize; + + @JsonProperty("Labels") + public Map labels; + + @JsonProperty("Containers") + private Integer containers; + public String getId() { return id; } @@ -42,6 +56,10 @@ public String[] getRepoTags() { return repoTags; } + public String[] getRepoDigests() { + return repoDigests; + } + public String getParentId() { return parentId; } @@ -57,4 +75,17 @@ public Long getSize() { public Long getVirtualSize() { return virtualSize; } + + + public Long getSharedSize() { + return sharedSize; + } + + public Map getLabels() { + return labels; + } + + public Integer getContainers() { + return containers; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java new file mode 100644 index 000000000..fb8f5d95c --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java @@ -0,0 +1,97 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.annotation.CheckForNull; +import java.io.Serializable; +import java.util.List; + +/** + * Represents an individual image layer information in response to the ImageHistory operation. + */ +@EqualsAndHashCode +@ToString +public class ImageHistory extends DockerObject implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonProperty("Id") + private String id; + + @JsonProperty("Created") + private Long created; + + @JsonProperty("CreatedBy") + private String createdBy; + + @JsonProperty("Tags") + private List tags; + + @JsonProperty("Size") + private Long size; + + @JsonProperty("Comment") + private String comment; + + @CheckForNull + public String getId() { + return id; + } + + public ImageHistory withId(String id) { + this.id = id; + return this; + } + + @CheckForNull + public Long getCreated() { + return created; + } + + public ImageHistory withCreated(Long created) { + this.created = created; + return this; + } + + @CheckForNull + public String getCreatedBy() { + return createdBy; + } + + public ImageHistory withCreatedBy(String createdBy) { + this.createdBy = createdBy; + return this; + } + + @CheckForNull + public List getTags() { + return tags; + } + + public ImageHistory withTags(List tags) { + this.tags = tags; + return this; + } + + @CheckForNull + public Long getSize() { + return size; + } + + public ImageHistory withSize(Long size) { + this.size = size; + return this; + } + + @CheckForNull + public String getComment() { + return comment; + } + + public ImageHistory withComment(String comment) { + this.comment = comment; + return this; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java new file mode 100644 index 000000000..bc8b89acb --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java @@ -0,0 +1,27 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @since {@link RemoteApiVersion#VERSION_1_48} + */ +@EqualsAndHashCode +@ToString +public class ImageOptions extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + @JsonProperty("Subpath") + private String subpath; + + public String getSubpath() { + return subpath; + } + + public ImageOptions withSubpath(String subpath) { + this.subpath = subpath; + return this; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index e472fa622..67348b86b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class Info implements Serializable { +public class Info extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** @@ -97,6 +97,12 @@ public class Info implements Serializable { @JsonProperty("LoggingDriver") private String loggingDriver; + @JsonProperty("CgroupDriver") + private String cGroupDriver; + + @JsonProperty("CgroupVersion") + private String cGroupVersion; + /** * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ @@ -232,6 +238,12 @@ public class Info implements Serializable { @JsonProperty("Isolation") private String isolation; + @JsonProperty("SecurityOptions") + private List securityOptions; + + @JsonProperty("Runtimes") + private Map runtimes; + /** * @see #architecture */ @@ -480,6 +492,22 @@ public String getLoggingDriver() { return loggingDriver; } + /** + * @see #cGroupDriver + */ + @CheckForNull + public String getCGroupDriver() { + return cGroupDriver; + } + + /** + * @see #cGroupVersion + */ + @CheckForNull + public String getCGroupVersion() { + return cGroupVersion; + } + /** * @see #loggingDriver */ @@ -488,6 +516,22 @@ public Info withLoggingDriver(String loggingDriver) { return this; } + /** + * @see #cGroupDriver + */ + public Info withCGroupDriver(String cGroupDriver) { + this.cGroupDriver = cGroupDriver; + return this; + } + + /** + * @see #cGroupVersion + */ + public Info withCGroupVersion(String cGroupVersion) { + this.cGroupVersion = cGroupVersion; + return this; + } + /** * @see #experimentalBuild */ @@ -1063,4 +1107,34 @@ public Info withIsolation(String isolation) { this.isolation = isolation; return this; } + + /** + * @see #securityOptions + */ + public List getSecurityOptions() { + return securityOptions; + } + + /** + * @see #securityOptions + */ + public Info withSecurityOptions(List securityOptions) { + this.securityOptions = securityOptions; + return this; + } + + /** + * @see #runtimes + */ + public Map getRuntimes() { + return runtimes; + } + + /** + * @see #runtimes + */ + public Info withRuntimes(Map runtimes) { + this.runtimes = runtimes; + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java index 8c4d9f35d..80bf803d8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public final class InfoRegistryConfig implements Serializable { +public final class InfoRegistryConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("IndexConfigs") @@ -82,7 +82,9 @@ public InfoRegistryConfig withMirrors(Object mirrors) { */ @EqualsAndHashCode @ToString - public static final class IndexConfig { + public static final class IndexConfig extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + @JsonProperty("Mirrors") private List mirrors; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java index 2bb4db285..ab400fcc8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java @@ -5,6 +5,7 @@ * * @see #TCP * @see #UDP + * @see #SCTP */ public enum InternetProtocol { /** @@ -15,7 +16,12 @@ public enum InternetProtocol { /** * The User Datagram Protocol */ - UDP; + UDP, + + /** + * The Stream Control Transmission Protocol + */ + SCTP; /** * The default {@link InternetProtocol}: {@link #TCP} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java index 20b2c1b26..4b9b27acf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -10,7 +11,8 @@ * variables in the target container as well as creating a network bridge between both containers. */ @EqualsAndHashCode -public class Link implements Serializable { +@ToString +public class Link extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java index 1c32984ee..18bfc75ba 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java @@ -1,26 +1,12 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = Links.Serializer.class) -@JsonDeserialize(using = Links.Deserializer.class) public class Links implements Serializable { private static final long serialVersionUID = 1L; @@ -38,37 +24,15 @@ public Link[] getLinks() { return links; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider) - throws IOException, JsonProcessingException { - jsonGen.writeStartArray(); - for (final Link link : links.getLinks()) { - jsonGen.writeString(link.toString()); - } - jsonGen.writeEndArray(); - } - + @JsonCreator + public static Links fromPrimitive(String[] links) { + return new Links( + Stream.of(links).map(Link::parse).toArray(Link[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - - @Override - public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - final List binds = new ArrayList<>(); - final ObjectCodec oc = jsonParser.getCodec(); - final JsonNode node = oc.readTree(jsonParser); - for (final Iterator it = node.elements(); it.hasNext();) { - - final JsonNode element = it.next(); - if (!element.equals(NullNode.getInstance())) { - binds.add(Link.parse(element.asText())); - } - } - return new Links(binds.toArray(new Link[0])); - } + @JsonValue + public String[] toPrimitive() { + return Stream.of(links).map(Link::toString).toArray(String[]::new); } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java new file mode 100644 index 000000000..bf90c69bf --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +public class LoadResponseItem extends ResponseItem { + + private static final long serialVersionUID = 1L; + + private static final String IMPORT_SUCCESS = "Loaded image:"; + + /** + * Returns whether the stream field indicates a successful build operation + */ + @JsonIgnore + public boolean isBuildSuccessIndicated() { + if (isErrorIndicated() || getStream() == null) { + return false; + } + + return getStream().contains(IMPORT_SUCCESS); + } + + @JsonIgnore + public String getMessage() { + if (!isBuildSuccessIndicated()) { + return null; + } else if (getStream().contains(IMPORT_SUCCESS)) { + return getStream(); + } + + return null; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java index 4ea19041e..218cdd827 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -18,7 +20,9 @@ * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed * and up-to-date explanation of the available types and their options. */ -public class LogConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class LogConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Type") @@ -62,6 +66,7 @@ public LogConfig setConfig(Map config) { public enum LoggingType { NONE("none"), DEFAULT("json-file"), + LOCAL("local"), ETWLOGS("etwlogs"), JSON_FILE("json-file"), SYSLOG("syslog"), @@ -71,7 +76,8 @@ public enum LoggingType { AWSLOGS("awslogs"), DB("db"), // Synology specific driver SPLUNK("splunk"), - GCPLOGS("gcplogs"); + GCPLOGS("gcplogs"), + LOKI("loki"); private String type; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java index ddf1bbae0..36fc1a9cb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public class LxcConf implements Serializable { +@EqualsAndHashCode +@ToString +public class LxcConf extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Key") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java index 12e6abccf..b57f05135 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,7 +12,9 @@ * * @author Yuting Liu */ -public class MemoryStatsConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class MemoryStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("stats") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java index 7254ccb19..3f17343c3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Mount implements Serializable { +public class Mount extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** @@ -57,6 +57,12 @@ public class Mount implements Serializable { @JsonProperty("TmpfsOptions") private TmpfsOptions tmpfsOptions; + /** + * @since 1.48 + */ + @JsonProperty("ImageOptions") + private ImageOptions imageOptions; + /** * @see #type */ @@ -177,4 +183,23 @@ public Mount withTmpfsOptions(TmpfsOptions tmpfsOptions) { } return this; } + + /** + * @see #imageOptions + */ + @CheckForNull + public ImageOptions getImageOptions() { + return imageOptions; + } + + /** + * @see #imageOptions + */ + public Mount withImageOptions(ImageOptions imageOptions) { + this.imageOptions = imageOptions; + if (imageOptions != null) { + this.type = MountType.IMAGE; + } + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java index 62557df47..b522c9612 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java @@ -14,6 +14,14 @@ public enum MountType { //@since 1.29 @JsonProperty("tmpfs") - TMPFS + TMPFS, + + //@since 1.40 + @JsonProperty("npipe") + NPIPE, + + //@since 1.48 + @JsonProperty("image") + IMAGE, } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java index e06f69d01..198c75543 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java @@ -5,6 +5,7 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ +@Deprecated public class NamedResourceSpec extends GenericResource implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index 0187d73f4..7e9d3b2fd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -7,17 +7,21 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @EqualsAndHashCode @ToString -public class Network implements Serializable { +public class Network extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Id") private String id; + @JsonProperty("Created") + private Date created; + @JsonProperty("Name") private String name; @@ -52,6 +56,10 @@ public String getId() { return id; } + public Date getCreated() { + return created; + } + public String getName() { return name; } @@ -94,7 +102,14 @@ public Map getLabels() { @EqualsAndHashCode @ToString - public static class ContainerNetworkConfig { + public static class ContainerNetworkConfig extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * @since {@link RemoteApiVersion#VERSION_1_22} + */ + @JsonProperty("Name") + private String name; @JsonProperty("EndpointID") private String endpointId; @@ -108,6 +123,10 @@ public static class ContainerNetworkConfig { @JsonProperty("IPv6Address") private String ipv6Address; + public String getName() { + return name; + } + public String getEndpointId() { return endpointId; } @@ -127,7 +146,8 @@ public String getIpv6Address() { @EqualsAndHashCode @ToString - public static class Ipam { + public static class Ipam extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("Driver") private String driver; @@ -165,7 +185,10 @@ public Ipam withDriver(String driver) { return this; } - public static class Config { + @EqualsAndHashCode + @ToString + public static class Config extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("Subnet") private String subnet; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java index 2afa87b73..db0eb1ded 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class NetworkAttachmentConfig implements Serializable { +public class NetworkAttachmentConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java index 3ef92ac64..e28d8f52c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class NetworkSettings implements Serializable { +public class NetworkSettings extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Bridge") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java index 2b12ab48f..2bb832e48 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class Node implements Serializable { +public class Node extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java index 0b0259049..5fa361977 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -13,7 +14,8 @@ * same base version, only one of the requests can succeed. As a result, two separate update requests that * happen at the same time will not unintentionally overwrite each other. */ -public class ObjectVersion implements Serializable { +@EqualsAndHashCode +public class ObjectVersion extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Index") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java index e20af63b9..8937b9593 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class PeerNode implements Serializable { +public class PeerNode extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java index c3d13596f..df953e140 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,7 +12,9 @@ * * @author Yuting Liu */ -public class PidsStatsConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class PidsStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("current") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java index 47655079b..2b7901e92 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class PortBinding implements Serializable { +public class PortBinding extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final Binding binding; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java index 57f2f61b0..cec07d9cd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class PortConfig implements Serializable { +public class PortConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java index f47b06f1d..8af2fe02c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java @@ -11,6 +11,9 @@ public enum PortConfigProtocol { TCP, @JsonProperty("udp") - UDP + UDP, + + @JsonProperty("sctp") + SCTP } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java index a2ae85e23..0411ca218 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java @@ -1,25 +1,16 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; -import java.io.IOException; import java.io.Serializable; import java.util.HashMap; -import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method. @@ -30,9 +21,6 @@ * @see HostConfig#getPortBindings() * @see NetworkSettings#getPorts() */ -@SuppressWarnings(value = "checkstyle:equalshashcode") -@JsonDeserialize(using = Ports.Deserializer.class) -@JsonSerialize(using = Ports.Serializer.class) public class Ports implements Serializable { private static final long serialVersionUID = 1L; @@ -118,7 +106,8 @@ public Map getBindings() { * @see ExposedPort */ @EqualsAndHashCode - public static class Binding { + public static class Binding extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; /** * Creates a {@link Binding} for the given {@link #getHostPortSpec() port spec}, leaving the {@link #getHostIp() IP address} @@ -259,60 +248,40 @@ public String toString() { } } - public static class Deserializer extends JsonDeserializer { - @Override - public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - Ports out = new Ports(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { + @JsonCreator + public static Ports fromPrimitive(Map>> map) { + Ports out = new Ports(); + for (Entry>> entry : map.entrySet()) { + ExposedPort exposedPort = ExposedPort.parse(entry.getKey()); - Map.Entry portNode = it.next(); - JsonNode bindingsArray = portNode.getValue(); - if (bindingsArray.equals(NullNode.getInstance())) { - out.bind(ExposedPort.parse(portNode.getKey()), null); - } else { - for (int i = 0; i < bindingsArray.size(); i++) { - JsonNode bindingNode = bindingsArray.get(i); - if (!bindingNode.equals(NullNode.getInstance())) { - String hostIp = bindingNode.get("HostIp").textValue(); - String hostPort = bindingNode.get("HostPort").textValue(); - out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort)); - } - } + if (entry.getValue() == null) { + out.bind(exposedPort, null); + } else { + for (Map binding : entry.getValue()) { + out.bind(exposedPort, new Binding(binding.get("HostIp"), binding.get("HostPort"))); } } - return out; } + return out; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (Entry entry : portBindings.getBindings().entrySet()) { - jsonGen.writeFieldName(entry.getKey().toString()); - if (entry.getValue() != null) { - jsonGen.writeStartArray(); - for (Binding binding : entry.getValue()) { - jsonGen.writeStartObject(); - jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp()); - jsonGen.writeStringField("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec()); - jsonGen.writeEndObject(); - } - jsonGen.writeEndArray(); - } else { - jsonGen.writeNull(); - } - } - jsonGen.writeEndObject(); - } - + @JsonValue + public Map>> toPrimitive() { + // Use reduce-like collect to be able to put nulls into the values + return ports.entrySet().stream().collect( + HashMap::new, + (map, entry) -> { + List> value = entry.getValue() == null ? null : Stream.of(entry.getValue()) + .map(binding -> { + Map result = new HashMap<>(); + result.put("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp()); + result.put("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec()); + return result; + }) + .collect(Collectors.toList()); + map.put(entry.getKey().toString(), value); + }, + HashMap::putAll + ); } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java index 9be7d6e43..3e1db4438 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java @@ -13,11 +13,20 @@ public enum PropagationMode { /** shared */ SHARED("shared"), + /** rshared */ + RSHARED("rshared"), + /** slave */ SLAVE("slave"), + /** rslave */ + RSLAVE("rslave"), + /** private */ - PRIVATE("private"); + PRIVATE("private"), + + /** rprivate */ + RPRIVATE("rprivate"); /** * The default {@link PropagationMode}: {@link #DEFAULT} @@ -39,10 +48,16 @@ public static PropagationMode fromString(String v) { switch (v) { case "shared": return SHARED; + case "rshared": + return RSHARED; case "slave": return SLAVE; + case "rslave": + return RSLAVE; case "private": return PRIVATE; + case "rprivate": + return RPRIVATE; default: return DEFAULT; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java index 3efaf47c1..2ccdf72c4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class PruneResponse implements Serializable { +public class PruneResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("SpaceReclaimed") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 66a559934..1d3f33c8e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem { private static final String DOWNLOADED_SWARM = ": downloaded"; + private static final String ALREADY_EXISTS = "Already exists"; + /** * Returns whether the status indicates a successful pull operation * @@ -34,7 +36,8 @@ public boolean isPullSuccessIndicated() { getStatus().contains(IMAGE_UP_TO_DATE) || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY) || - getStatus().contains(DOWNLOADED_SWARM) + getStatus().contains(DOWNLOADED_SWARM) || + getStatus().contains(ALREADY_EXISTS) ); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java index 750eb6f4d..5dd636981 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Repository implements Serializable { +public class Repository extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; public final String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java index 463b22011..54e3001b8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceRequirements implements Serializable { +public class ResourceRequirements extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java index 86ab24b52..00f2de7e1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceSpecs implements Serializable { +public class ResourceSpecs extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java index 4838b78d7..babee6a50 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceVersion implements Serializable { +public class ResourceVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java index d0f797a71..cd90b78f3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ResponseItem implements Serializable { +public class ResponseItem extends DockerObject implements Serializable { private static final long serialVersionUID = -5187169652557467828L; @JsonProperty("stream") @@ -118,7 +118,7 @@ public boolean isErrorIndicated() { @EqualsAndHashCode @ToString - public static class ProgressDetail implements Serializable { + public static class ProgressDetail extends DockerObject implements Serializable { private static final long serialVersionUID = -1954994695645715264L; @JsonProperty("current") @@ -148,7 +148,7 @@ public Long getStart() { @EqualsAndHashCode @ToString - public static class ErrorDetail implements Serializable { + public static class ErrorDetail extends DockerObject implements Serializable { private static final long serialVersionUID = -9136704865403084083L; @JsonProperty("code") @@ -170,7 +170,7 @@ public String getMessage() { @EqualsAndHashCode @ToString - public static class AuxDetail implements Serializable { + public static class AuxDetail extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Size") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java index 114d9f0d8..53453915c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -27,7 +28,8 @@ * */ @EqualsAndHashCode -public class RestartPolicy implements Serializable { +@ToString +public class RestartPolicy extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("MaximumRetryCount") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java new file mode 100644 index 000000000..c64511cda --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java @@ -0,0 +1,23 @@ +package com.github.dockerjava.api.model; + +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode +@ToString +public class RuntimeInfo extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + + private String path; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java index a77f38053..23a5c3bbf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SearchItem implements Serializable { +public class SearchItem extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("star_count") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java index 20680f5fb..bfbd7caf4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; import java.util.Date; @@ -10,7 +12,9 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -public class Secret implements Serializable { +@EqualsAndHashCode +@ToString +public class Secret extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java index 572c0c90e..6b10239b9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SecretSpec implements Serializable { +public class SecretSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java index 63b3b4757..fd76be259 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class Service implements Serializable { +public class Service extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java index ccd9b4bea..37feec292 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java @@ -11,7 +11,7 @@ @EqualsAndHashCode @ToString @SuppressWarnings("checkstyle:hideutilityclassconstructor") -public class ServiceGlobalModeOptions implements Serializable { +public class ServiceGlobalModeOptions extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; // Intentionally left blank, there are no options for this mode diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java index c179271bf..82d1b3b20 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceModeConfig implements Serializable { +public class ServiceModeConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java index 9c2f0223a..4c0953508 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ServicePlacement implements Serializable { +public class ServicePlacement extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** @@ -28,6 +28,12 @@ public class ServicePlacement implements Serializable { @JsonProperty("Platforms") private List platforms; + /** + * @since 1.40 + */ + @JsonProperty("MaxReplicas") + private Integer maxReplicas; + /** * @see #constraints */ @@ -54,4 +60,31 @@ public List getPlatforms() { public void setPlatforms(List platforms) { this.platforms = platforms; } + + /** + * Specifies the maximum amount of replicas / tasks that can run on one node. + * 0 means unlimited replicas per node. + * + * @param maxReplicas Max number of replicas + * @return This instance of ServicePlacement + * @throws IllegalArgumentException if maxReplicas is less than 0 + */ + public ServicePlacement withMaxReplicas(int maxReplicas) { + if (maxReplicas < 0) { + throw new IllegalArgumentException("The Value for MaxReplicas must be greater or equal to 0"); + } + + this.maxReplicas = maxReplicas; + return this; + } + + /** + * Getter for maxReplicas + * + * @return The maximum amount of replicas / tasks that can run on one node. + */ + public Integer getMaxReplicas() { + return this.maxReplicas; + } + } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java index c28a09370..eea2a5211 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceReplicatedModeOptions implements Serializable { +public class ServiceReplicatedModeOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java index 8b55315e0..11b54f666 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceRestartPolicy implements Serializable { +public class ServiceRestartPolicy extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java index b5ca4a5dd..a1fbec916 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceSpec implements Serializable { +public class ServiceSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java index e748bbd4a..d22f8999e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java @@ -6,6 +6,9 @@ * @since {@link RemoteApiVersion#VERSION_1_24} */ public enum ServiceUpdateState { + @JsonProperty("unknown") + UNKNOWN, + @JsonProperty("updating") UPDATING, @@ -15,6 +18,12 @@ public enum ServiceUpdateState { @JsonProperty("completed") COMPLETED, + @JsonProperty("rollback_started") + ROLLBACK_STARTED, + + @JsonProperty("rollback_paused") + ROLLBACK_PAUSED, + @JsonProperty("rollback_completed") ROLLBACK_COMPLETED } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java index ee457d9f8..18cb54603 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceUpdateStatus implements Serializable { +public class ServiceUpdateStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java index d22b6a787..2ba57d76b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class StatisticNetworksConfig implements Serializable { +public class StatisticNetworksConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("rx_bytes") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java index 2bbc91777..3800363eb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java @@ -14,12 +14,15 @@ */ @EqualsAndHashCode @ToString -public class Statistics implements Serializable { +public class Statistics extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("read") private String read; + @JsonProperty("preread") + private String preread; + /** * @since Docker Remote API 1.21 */ @@ -43,6 +46,9 @@ public class Statistics implements Serializable { @JsonProperty("cpu_stats") private CpuStatsConfig cpuStats; + @JsonProperty("num_procs") + private Long numProcs; + /** * @since Docker Remote API 1.19 */ @@ -59,6 +65,10 @@ public String getRead() { return read; } + public String getPreread() { + return preread; + } + /** * @since Docker Remote API 1.21 */ @@ -79,6 +89,10 @@ public CpuStatsConfig getCpuStats() { return cpuStats; } + public Long getNumProcs() { + return numProcs; + } + /** * The cpu statistic of last read, which is used for calculating the cpu usage percent. * It is not the exact copy of the {@link #getCpuStats()}. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java index 19b95a7ff..8afbc34d9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java @@ -1,11 +1,15 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; -public class StatsConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class StatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("active_anon") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java index 6f632aa1b..8ebc97ffd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmCAConfig implements Serializable { +public class SwarmCAConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java index bc8fd4305..2a45b84cd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmDispatcherConfig implements Serializable { +public class SwarmDispatcherConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java index 3fd8e8704..faed0fcf3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmInfo implements Serializable { +public class SwarmInfo extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java index 06b1f3a78..9e5f63aea 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmJoinTokens implements Serializable { +public class SwarmJoinTokens extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java index cdb17c20d..9b5aff96c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNode implements Serializable { +public class SwarmNode extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java index d0c35c873..f929327d1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeDescription implements Serializable { +public class SwarmNodeDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java index 41c369d09..a2f38531e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeEngineDescription implements Serializable { +public class SwarmNodeEngineDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java index 07a0e448b..0307d18e7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeManagerStatus implements Serializable { +public class SwarmNodeManagerStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java index 3b3747d5f..9688f10b0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodePlatform implements Serializable { +public class SwarmNodePlatform extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java index d05bfb9c9..aa051aaa3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodePluginDescription implements Serializable { +public class SwarmNodePluginDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java index 05f6d0203..c9586e921 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeResources implements Serializable { +public class SwarmNodeResources extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java index 5162bdff7..241c2be58 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeSpec implements Serializable { +public class SwarmNodeSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java index ba99a194a..34f40e80b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeStatus implements Serializable { +public class SwarmNodeStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** @@ -22,6 +22,12 @@ public class SwarmNodeStatus implements Serializable { @JsonProperty("State") private SwarmNodeState state; + /** + * @since 1.25 + */ + @JsonProperty("Addr") + private String address; + /** * @see #state */ @@ -37,4 +43,20 @@ public SwarmNodeStatus withState(SwarmNodeState state) { this.state = state; return this; } + + /** + * @see #address + */ + @CheckForNull + public String getAddress() { + return address; + } + + /** + * @see #address + */ + public SwarmNodeStatus withAddress(String address) { + this.address = address; + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java index 35cbba491..4182c120e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeVersion implements Serializable { +public class SwarmNodeVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java index 60cc1f32d..0479a3a6c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmOrchestration implements Serializable { +public class SwarmOrchestration extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java index 16553defc..69138ed2d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmRaftConfig implements Serializable { +public class SwarmRaftConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java index bbc8f6db6..ee041a2a7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmSpec implements Serializable { +public class SwarmSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java index 2d7fc3e43..161c0d7e5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmVersion implements Serializable { +public class SwarmVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java index 46585eed8..0f1e77a2a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Task implements Serializable { +public class Task extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ID") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java index c385bd1b9..ae03c2136 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class TaskDefaults implements Serializable { +public class TaskDefaults extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java index bef5e579d..c60ca3b8d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class TaskSpec implements Serializable { +public class TaskSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java index a335350e4..9ae2a72ad 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TaskStatus implements Serializable { +public class TaskStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Timestamp") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java index 0349e301f..1f6f61d1d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TaskStatusContainerStatus implements Serializable { +public class TaskStatusContainerStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ContainerID") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java index ce29b7057..e908ce8de 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,7 +12,9 @@ * * @author Yuting Liu */ -public class ThrottlingDataConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class ThrottlingDataConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("periods") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java index b2dc02a30..e64adaac2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TmpfsOptions implements Serializable { +public class TmpfsOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("SizeBytes") //The size for the tmpfs mount in bytes. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java index b71c8c40a..24dbd764e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java @@ -1,6 +1,9 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,24 +14,29 @@ /** * @author Vangie Du (duwan@live.com) */ +@JsonPropertyOrder({"Name", "Soft", "Hard"}) @EqualsAndHashCode @ToString -public class Ulimit implements Serializable { +public class Ulimit extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") private String name; - @JsonProperty("Soft") - private Integer soft; + private Long soft; - @JsonProperty("Hard") - private Integer hard; + private Long hard; public Ulimit() { } + @Deprecated public Ulimit(String name, int soft, int hard) { + this(name, (long) soft, (long) hard); + } + + @JsonCreator + public Ulimit(@JsonProperty("Name") String name, @JsonProperty("Soft") long soft, @JsonProperty("Hard") long hard) { requireNonNull(name, "Name is null"); this.name = name; this.soft = soft; @@ -39,11 +47,25 @@ public String getName() { return name; } + @Deprecated + @JsonIgnore public Integer getSoft() { - return soft; + return soft != null ? soft.intValue() : null; } + @Deprecated + @JsonIgnore public Integer getHard() { + return hard != null ? hard.intValue() : null; + } + + @JsonProperty("Soft") + public Long getSoftLong() { + return soft; + } + + @JsonProperty("Hard") + public Long getHardLong() { return hard; } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java index ee5d4a740..a70e137a9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class UpdateConfig implements Serializable { +public class UpdateConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java index 2ac89e88b..1a05726fc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class Version implements Serializable { +public class Version extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ApiVersion") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java index bee6774ba..9a9fb9071 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class VersionComponent implements Serializable { +public class VersionComponent extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Details") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java index 96b389ef6..72d29a44b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class VersionPlatform implements Serializable { +public class VersionPlatform extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java index aad95a265..bc511476f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java @@ -2,10 +2,12 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; import javax.annotation.Nonnull; import java.io.Serializable; +import java.util.Map; /** * Represents a bind mounted volume in a Docker container. @@ -27,13 +29,25 @@ public class Volume implements Serializable { * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant. * @param path the destination path of the bind mounted volume * @return a volume instance referring to the given path. + * @deprecated use {@link #parse(Map)} */ @Nonnull - @JsonCreator + @Deprecated public static Volume parse(@JsonProperty("path") String path) { return new Volume(path); } + /** + * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant. + * @param path the destination path of the bind mounted volume + * @return a volume instance referring to the given path. + */ + @Nonnull + @JsonCreator + public static Volume parse(Map primitive) { + return new Volume(primitive.get("path")); + } + private String path; /** @@ -50,6 +64,7 @@ public String getPath() { } @Override + @JsonValue public String toString() { return getPath(); } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java index f78fc587e..93c106070 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java @@ -1,8 +1,11 @@ package com.github.dockerjava.api.model; +import lombok.EqualsAndHashCode; + import java.io.Serializable; -public class VolumeBind implements Serializable { +@EqualsAndHashCode +public class VolumeBind extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final String hostPath; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java index 3c1d4ab47..1fbc0ca12 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java @@ -1,28 +1,15 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; -// This is not going to be serialized -@JsonDeserialize(using = VolumeBinds.Deserializer.class) -@JsonSerialize(using = VolumeBinds.Serializer.class) +@ToString public class VolumeBinds implements Serializable { private static final long serialVersionUID = 1L; @@ -36,41 +23,21 @@ public VolumeBind[] getBinds() { return binds; } - public static final class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException, - JsonProcessingException { - jgen.writeStartObject(); - for (final VolumeBind bind : value.binds) { - jgen.writeStringField(bind.getContainerPath(), bind.getHostPath()); - } - jgen.writeEndObject(); - } + @JsonCreator + public static VolumeBinds fromPrimitive(Map primitive) { + return new VolumeBinds( + primitive.entrySet().stream() + .map(it -> new VolumeBind(it.getValue(), it.getKey())) + .toArray(VolumeBind[]::new) + ); } - public static final class Deserializer extends JsonDeserializer { - @Override - public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List binds = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - Map.Entry field = it.next(); - JsonNode value = field.getValue(); - if (!value.equals(NullNode.getInstance())) { - if (!value.isTextual()) { - throw deserializationContext.mappingException("Expected path for '" + field.getKey() - + "'in host but got '" + value + "'."); - } - VolumeBind bind = new VolumeBind(value.asText(), field.getKey()); - binds.add(bind); - } - } - return new VolumeBinds(binds.toArray(new VolumeBind[binds.size()])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(binds).collect(Collectors.toMap( + VolumeBind::getContainerPath, + VolumeBind::getHostPath + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java index f0d98fc25..740ffcd51 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class VolumeOptions implements Serializable { +public class VolumeOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java index 0c698ae6c..66ba57ced 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java @@ -1,21 +1,12 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; +import java.util.Collections; +import java.util.Map; import java.util.Map.Entry; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; /** @@ -24,8 +15,6 @@ * @see Bind * @deprecated since {@link RemoteApiVersion#VERSION_1_20} */ -@JsonDeserialize(using = VolumeRW.Deserializer.class) -@JsonSerialize(using = VolumeRW.Serializer.class) @Deprecated @EqualsAndHashCode public class VolumeRW implements Serializable { @@ -63,35 +52,15 @@ public String toString() { return getVolume() + ":" + getAccessMode(); } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - jsonGen.writeFieldName(volumeRW.getVolume().getPath()); - jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean())); - jsonGen.writeEndObject(); - } - + @JsonCreator + public static VolumeRW fromPrimitive(Map map) { + Entry entry = map.entrySet().iterator().next(); + return new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue())); } - public static class Deserializer extends JsonDeserializer { - @Override - public VolumeRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - if (!node.equals(NullNode.getInstance())) { - Entry field = node.fields().next(); - String volume = field.getKey(); - AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean()); - return new VolumeRW(new Volume(volume), accessMode); - } else { - return null; - } - } + @JsonValue + public Map toPrimitive() { + return Collections.singletonMap(volume.getPath(), accessMode.toBoolean()); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java index b6844b987..825b8481a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java @@ -1,27 +1,16 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; -@JsonSerialize(using = Volumes.Serializer.class) -@JsonDeserialize(using = Volumes.Deserializer.class) +@ToString public class Volumes implements Serializable { private static final long serialVersionUID = 1L; @@ -39,42 +28,19 @@ public Volume[] getVolumes() { return volumes; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (Volume volume : volumes.getVolumes()) { - jsonGen.writeFieldName(volume.getPath()); - jsonGen.writeStartObject(); - jsonGen.writeEndObject(); - } - jsonGen.writeEndObject(); - } - + @JsonCreator + public static Volumes fromPrimitive(Map map) { + return new Volumes( + map.keySet().stream().map(Volume::new).toArray(Volume[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - @Override - public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List volumes = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - - Map.Entry field = it.next(); - if (!field.getValue().equals(NullNode.getInstance())) { - String path = field.getKey(); - Volume volume = new Volume(path); - volumes.add(volume); - } - } - return new Volumes(volumes.toArray(new Volume[0])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(volumes).collect(Collectors.toMap( + Volume::getPath, + __ -> new Object() + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java index b70fa0384..98165afa9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java @@ -1,23 +1,11 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; -@JsonSerialize(using = VolumesFrom.Serializer.class) -@JsonDeserialize(using = VolumesFrom.Deserializer.class) @EqualsAndHashCode public class VolumesFrom implements Serializable { private static final long serialVersionUID = 1L; @@ -52,6 +40,7 @@ public AccessMode getAccessMode() { * @throws IllegalArgumentException * if the specification cannot be parsed */ + @JsonCreator public static VolumesFrom parse(String serialized) { try { String[] parts = serialized.split(":"); @@ -79,32 +68,9 @@ public static VolumesFrom parse(String serialized) { * @return a string representation of this {@link VolumesFrom} */ @Override + @JsonValue public String toString() { return container + ":" + accessMode.toString(); } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeString(volumeFrom.toString()); - - } - - } - - public static class Deserializer extends JsonDeserializer { - @Override - public VolumesFrom deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - return VolumesFrom.parse(node.asText()); - - } - } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java index 8fcaffb8d..93e95b68c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java @@ -1,28 +1,16 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; // This is not going to be serialized -@JsonSerialize(using = VolumesRW.Serializer.class) -@JsonDeserialize(using = VolumesRW.Deserializer.class) +@ToString public class VolumesRW implements Serializable { private static final long serialVersionUID = 1L; @@ -36,45 +24,20 @@ public VolumeRW[] getVolumesRW() { return volumesRW; } - public static final class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException, - JsonProcessingException { - jgen.writeStartObject(); - for (final VolumeRW volumeRW : value.volumesRW) { - jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean()); - } - jgen.writeEndObject(); - } - + @JsonCreator + public static VolumesRW fromPrimitive(Map map) { + return new VolumesRW( + map.entrySet().stream() + .map(entry -> new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue()))) + .toArray(VolumeRW[]::new) + ); } - public static final class Deserializer extends JsonDeserializer { - @Override - public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List volumesRW = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - - for (Iterator> it = node.fields(); it.hasNext();) { - Map.Entry field = it.next(); - JsonNode value = field.getValue(); - - if (!value.equals(NullNode.getInstance())) { - if (!value.isBoolean()) { - throw deserializationContext.mappingException("Expected access mode for '" + field.getKey() - + "' in host but got '" + value + "'."); - } - - VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean())); - volumesRW.add(bind); - } - } - return new VolumesRW(volumesRW.toArray(new VolumeRW[volumesRW.size()])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(volumesRW).collect(Collectors.toMap( + it -> it.getVolume().getPath(), + it -> it.getAccessMode().toBoolean() + )); } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java new file mode 100644 index 000000000..8af0efa35 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java @@ -0,0 +1,26 @@ +package com.github.dockerjava.api.model; + +import javax.annotation.Nonnull; + +/** + * Docker Engine API wait conditions (added in v1.30). + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public enum WaitContainerCondition { + NOT_RUNNING("not-running"), + NEXT_EXIT("next-exit"), + REMOVED("removed"); + + @Nonnull + private final String value; + + WaitContainerCondition(@Nonnull String value) { + this.value = value; + } + + @Nonnull + public String getValue() { + return value; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java index d80343057..eed22870f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java @@ -1,13 +1,17 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; /** * Represents a wait container command response */ -public class WaitResponse implements Serializable { +@EqualsAndHashCode +@ToString +public class WaitResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("StatusCode") diff --git a/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java new file mode 100644 index 000000000..2df7051e9 --- /dev/null +++ b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java @@ -0,0 +1,46 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.tngtech.archunit.base.DescribedPredicate; +import com.tngtech.archunit.core.domain.JavaClass; +import com.tngtech.archunit.core.domain.JavaClasses; +import com.tngtech.archunit.core.importer.ClassFileImporter; +import com.tngtech.archunit.core.importer.ImportOption; +import org.junit.jupiter.api.Test; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; + +class DockerObjectArchTest { + + static JavaClasses CLASSES = new ClassFileImporter() + .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS) + .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_JARS) + .importPackagesOf( + Container.class, + CreateConfigResponse.class + ); + + @Test + void modelClassMustExtendDockerObject() { + classes() + .that().areNotEnums() + .and().areNotInterfaces() + .and().areNotAnnotatedWith(Deprecated.class) + .and().doNotImplement(ResultCallback.class) + .and().doNotImplement(DockerCmdExecFactory.class) + .and().doNotBelongToAnyOf(DockerObjectAccessor.class) + .and(new DescribedPredicate("not @JsonCreator-based object") { + @Override + public boolean apply(JavaClass input) { + return input.getAllMethods().stream().noneMatch(method -> { + return method.isAnnotatedWith(JsonCreator.class); + }); + } + }) + .should().beAssignableTo(DockerObject.class) + .check(CLASSES); + } +} diff --git a/docker-java-bom/pom.xml b/docker-java-bom/pom.xml new file mode 100644 index 000000000..7066b3a67 --- /dev/null +++ b/docker-java-bom/pom.xml @@ -0,0 +1,67 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-bom + pom + + docker-java + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + + ${project.groupId} + docker-java + ${project.version} + + + ${project.groupId} + docker-java-api + ${project.version} + + + ${project.groupId} + docker-java-core + ${project.version} + + + ${project.groupId} + docker-java-transport + ${project.version} + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + + + ${project.groupId} + docker-java-transport-jersey + ${project.version} + + + ${project.groupId} + docker-java-transport-netty + ${project.version} + + + ${project.groupId} + docker-java-transport-okhttp + ${project.version} + + + ${project.groupId} + docker-java-transport-zerodep + ${project.version} + + + + diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index df1a74d1e..89c72c024 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,22 +4,31 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 0-SNAPSHOT ../pom.xml docker-java-core - bundle + jar docker-java-core https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.core + + - ${groupId} + ${project.groupId} docker-java-api - ${version} + ${project.version} + + + ${project.groupId} + docker-java-transport + ${project.version} @@ -41,9 +50,15 @@ - commons-lang - commons-lang - ${commons-lang.version} + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + com.fasterxml.jackson.core + jackson-databind + 2.20.1 @@ -54,7 +69,7 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncycastle.version} @@ -84,6 +99,7 @@ 8 8 + true diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 34fdceb37..9e1d71020 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -1,14 +1,18 @@ package com.github.dockerjava.core; +import java.util.Objects; + import com.github.dockerjava.api.command.AttachContainerCmd; import com.github.dockerjava.api.command.AuthCmd; import com.github.dockerjava.api.command.BuildImageCmd; import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -22,9 +26,11 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -33,6 +39,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -41,6 +48,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -49,6 +57,7 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; @@ -57,8 +66,11 @@ import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -78,9 +90,11 @@ import com.github.dockerjava.core.exec.CommitCmdExec; import com.github.dockerjava.core.exec.ConnectToNetworkCmdExec; import com.github.dockerjava.core.exec.ContainerDiffCmdExec; +import com.github.dockerjava.core.exec.ExportContainerCmdExec; import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec; import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec; import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec; +import com.github.dockerjava.core.exec.CreateConfigCmdExec; import com.github.dockerjava.core.exec.CreateContainerCmdExec; import com.github.dockerjava.core.exec.CreateImageCmdExec; import com.github.dockerjava.core.exec.CreateNetworkCmdExec; @@ -91,11 +105,18 @@ import com.github.dockerjava.core.exec.EventsCmdExec; import com.github.dockerjava.core.exec.ExecCreateCmdExec; import com.github.dockerjava.core.exec.ExecStartCmdExec; +import com.github.dockerjava.core.exec.InspectConfigCmdExec; +import com.github.dockerjava.core.exec.ListConfigsCmdExec; +import com.github.dockerjava.core.exec.LoadImageAsyncCmdExec; +import com.github.dockerjava.core.exec.RemoveConfigCmdExec; +import com.github.dockerjava.core.exec.ResizeContainerCmdExec; +import com.github.dockerjava.core.exec.ResizeExecCmdExec; import com.github.dockerjava.core.exec.InfoCmdExec; import com.github.dockerjava.core.exec.InitializeSwarmCmdExec; import com.github.dockerjava.core.exec.InspectContainerCmdExec; import com.github.dockerjava.core.exec.InspectExecCmdExec; import com.github.dockerjava.core.exec.InspectImageCmdExec; +import com.github.dockerjava.core.exec.ImageHistoryCmdExec; import com.github.dockerjava.core.exec.InspectNetworkCmdExec; import com.github.dockerjava.core.exec.InspectServiceCmdExec; import com.github.dockerjava.core.exec.InspectSwarmCmdExec; @@ -130,6 +151,7 @@ import com.github.dockerjava.core.exec.RenameContainerCmdExec; import com.github.dockerjava.core.exec.RestartContainerCmdExec; import com.github.dockerjava.core.exec.SaveImageCmdExec; +import com.github.dockerjava.core.exec.SaveImagesCmdExec; import com.github.dockerjava.core.exec.SearchImagesCmdExec; import com.github.dockerjava.core.exec.StartContainerCmdExec; import com.github.dockerjava.core.exec.StatsCmdExec; @@ -144,22 +166,22 @@ import com.github.dockerjava.core.exec.VersionCmdExec; import com.github.dockerjava.core.exec.WaitContainerCmdExec; -import static com.google.common.base.Preconditions.checkNotNull; - public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { private DockerClientConfig dockerClientConfig; + protected Integer connectTimeout; + protected Integer readTimeout; + protected DockerClientConfig getDockerClientConfig() { - checkNotNull(dockerClientConfig, + Objects.requireNonNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!"); return dockerClientConfig; } @Override public void init(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified"); } @Override @@ -172,6 +194,22 @@ public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + /** + * Configure connection timeout in milliseconds + */ + public AbstractDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + this.connectTimeout = connectTimeout; + return this; + } + + /** + * Configure read timeout in milliseconds + */ + public AbstractDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + this.readTimeout = readTimeout; + return this; + } + @Override public AuthCmd.Exec createAuthCmdExec() { return new AuthCmdExec(getBaseResource(), getDockerClientConfig()); @@ -207,6 +245,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() { return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return new SaveImagesCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public CreateImageCmd.Exec createCreateImageCmdExec() { return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig()); @@ -217,6 +260,11 @@ public LoadImageCmd.Exec createLoadImageCmdExec() { return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() { + return new LoadImageAsyncCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public SearchImagesCmd.Exec createSearchImagesCmdExec() { return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig()); @@ -237,6 +285,11 @@ public InspectImageCmd.Exec createInspectImageCmdExec() { return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ImageHistoryCmd.Exec createImageHistoryCmdExec() { + return new ImageHistoryCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public ListContainersCmd.Exec createListContainersCmdExec() { return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig()); @@ -277,11 +330,21 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() { return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ResizeContainerCmd.Exec createResizeContainerCmdExec() { + return new ResizeContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public ExecStartCmd.Exec createExecStartCmdExec() { return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ResizeExecCmd.Exec createResizeExecCmdExec() { + return new ResizeExecCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public InspectExecCmd.Exec createInspectExecCmdExec() { return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig()); @@ -307,6 +370,11 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() { return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ExportContainerCmd.Exec createExportContainerCmdExec() { + return new ExportContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public KillContainerCmd.Exec createKillContainerCmdExec() { return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig()); @@ -520,5 +588,26 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ListConfigsCmd.Exec createListConfigsCmdExec() { + return new ListConfigsCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public CreateConfigCmd.Exec createCreateConfigCmdExec() { + return new CreateConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public InspectConfigCmd.Exec createInspectConfigCmdExec() { + return new InspectConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public RemoveConfigCmd.Exec createRemoveConfigCmdExec() { + return new RemoveConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + protected abstract WebTarget getBaseResource(); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 44f54bddb..dad75b360 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -5,11 +5,15 @@ import com.github.dockerjava.api.model.AuthConfigurations; import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; + +import java.util.Map.Entry; +import java.util.Optional; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -21,11 +25,11 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables @@ -36,6 +40,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf public static final String DOCKER_HOST = "DOCKER_HOST"; + public static final String DOCKER_CONTEXT = "DOCKER_CONTEXT"; + public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY"; public static final String DOCKER_CONFIG = "DOCKER_CONFIG"; @@ -56,6 +62,12 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf private static final Set CONFIG_KEYS = new HashSet<>(); + static final Properties DEFAULT_PROPERTIES = new Properties(); + + static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock"; + + static final String WINDOWS_DEFAULT_DOCKER_HOST = "npipe:////./pipe/docker_engine"; + static { CONFIG_KEYS.add(DOCKER_HOST); CONFIG_KEYS.add(DOCKER_TLS_VERIFY); @@ -66,6 +78,10 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf CONFIG_KEYS.add(REGISTRY_PASSWORD); CONFIG_KEYS.add(REGISTRY_EMAIL); CONFIG_KEYS.add(REGISTRY_URL); + + DEFAULT_PROPERTIES.put(DOCKER_CONFIG, "${user.home}/.docker"); + DEFAULT_PROPERTIES.put(REGISTRY_URL, "https://index.docker.io/v1/"); + DEFAULT_PROPERTIES.put(REGISTRY_USERNAME, "${user.name}"); } private final URI dockerHost; @@ -76,11 +92,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf private final RemoteApiVersion apiVersion; - private DockerConfigFile dockerConfig = null; + private final DockerConfigFile dockerConfig; - DefaultDockerClientConfig(URI dockerHost, String dockerConfigPath, String apiVersion, String registryUrl, - String registryUsername, String registryPassword, String registryEmail, SSLConfig sslConfig) { + DefaultDockerClientConfig(URI dockerHost, DockerConfigFile dockerConfigFile, String dockerConfigPath, String apiVersion, + String registryUrl, String registryUsername, String registryPassword, String registryEmail, + SSLConfig sslConfig) { this.dockerHost = checkDockerHostScheme(dockerHost); + this.dockerConfig = dockerConfigFile; this.dockerConfigPath = dockerConfigPath; this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion); this.sslConfig = sslConfig; @@ -91,29 +109,32 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf } private URI checkDockerHostScheme(URI dockerHost) { - if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) { - return dockerHost; - } else { - throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost - + "'. Only 'tcp://' or 'unix://' supported."); + if (dockerHost == null) { + throw new DockerClientException("'dockerHost' is null"); } + return dockerHost; } private static Properties loadIncludedDockerProperties(Properties systemProperties) { + Properties p = new Properties(); + p.putAll(DEFAULT_PROPERTIES); try (InputStream is = DefaultDockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) { - Properties p = new Properties(); - p.load(is); - replaceProperties(p, systemProperties); - return p; + if (is != null) { + p.load(is); + } } catch (IOException e) { throw new RuntimeException(e); } + replaceProperties(p, systemProperties); + return p; } private static void replaceProperties(Properties properties, Properties replacements) { - for (Object objectKey : properties.keySet()) { - String key = objectKey.toString(); - properties.setProperty(key, replaceProperties(properties.getProperty(key), replacements)); + for (Entry entry : properties.entrySet()) { + final String key = entry.getKey().toString(); + // no entry.getValue here because it does not have the same semantics as getProperty (defaults handling) + final String value = properties.getProperty(key); + entry.setValue(replaceProperties(value, replacements)); } } @@ -156,13 +177,26 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties, // special case which is a sensible default if (env.containsKey(DOCKER_HOST)) { - overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST)); + String value = env.get(DOCKER_HOST); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(DOCKER_HOST, value); + } + } + + if (env.containsKey(DOCKER_CONTEXT)) { + String value = env.get(DOCKER_CONTEXT); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(DOCKER_CONTEXT, value); + } } for (Map.Entry envEntry : env.entrySet()) { String envKey = envEntry.getKey(); if (CONFIG_KEYS.contains(envKey)) { - overriddenProperties.setProperty(envKey, envEntry.getValue()); + String value = envEntry.getValue(); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(envKey, value); + } } } @@ -240,13 +274,6 @@ public String getDockerConfigPath() { @Nonnull public DockerConfigFile getDockerConfig() { - if (dockerConfig == null) { - try { - dockerConfig = DockerConfigFile.loadConfig(getObjectMapper(), getDockerConfigPath()); - } catch (IOException e) { - throw new DockerClientException("Failed to parse docker configuration file", e); - } - } return dockerConfig; } @@ -307,7 +334,7 @@ public static class Builder { private URI dockerHost; private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, - dockerCertPath; + dockerCertPath, dockerContext; private Boolean dockerTlsVerify; @@ -319,8 +346,13 @@ public static class Builder { * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG. */ public Builder withProperties(Properties p) { - return withDockerHost(p.getProperty(DOCKER_HOST)) - .withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY)) + + if (p.getProperty(DOCKER_HOST) != null) { + withDockerHost(p.getProperty(DOCKER_HOST)); + } + + return withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY)) + .withDockerContext(p.getProperty(DOCKER_CONTEXT)) .withDockerConfig(p.getProperty(DOCKER_CONFIG)) .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH)) .withApiVersion(p.getProperty(API_VERSION)) @@ -334,7 +366,7 @@ public Builder withProperties(Properties p) { * configure DOCKER_HOST */ public final Builder withDockerHost(String dockerHost) { - checkNotNull(dockerHost, "uri was not specified"); + Objects.requireNonNull(dockerHost, "uri was not specified"); this.dockerHost = URI.create(dockerHost); return this; } @@ -379,6 +411,11 @@ public final Builder withDockerConfig(String dockerConfig) { return this; } + public final Builder withDockerContext(String dockerContext) { + this.dockerContext = dockerContext; + return this; + } + public final Builder withDockerTlsVerify(String dockerTlsVerify) { if (dockerTlsVerify != null) { String trimmed = dockerTlsVerify.trim(); @@ -394,6 +431,10 @@ public final Builder withDockerTlsVerify(Boolean dockerTlsVerify) { return this; } + public final boolean isDockerHostSetExplicitly() { + return dockerHost != null; + } + /** * Overrides the default {@link SSLConfig} that is used when calling {@link Builder#withDockerTlsVerify(java.lang.Boolean)} and * {@link Builder#withDockerCertPath(String)}. This way it is possible to pass a custom {@link SSLConfig} to the resulting @@ -404,7 +445,32 @@ public final Builder withCustomSslConfig(SSLConfig customSslConfig) { return this; } + private void applyContextConfiguration(final String context) { + final Optional dockerContextMetaFile = + Optional.ofNullable(context) + .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(), + new File(this.dockerConfig), ctx)); + final Optional dockerContextTLSFile = + Optional.ofNullable(context) + .flatMap(ctx -> DockerContextMetaFile.resolveContextTLSFile(new File(this.dockerConfig), ctx)); + + if (dockerContextMetaFile.isPresent()) { + final Optional dockerEndpoint = + dockerContextMetaFile.map(metaFile -> metaFile.endpoints).map(endpoint -> endpoint.docker); + if (this.dockerHost == null) { + this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null); + } + } + if (dockerContextTLSFile.isPresent() && this.dockerCertPath == null) { + this.dockerCertPath = dockerContextTLSFile.get().getAbsolutePath(); + this.dockerTlsVerify = true; + } + } + public DefaultDockerClientConfig build() { + final DockerConfigFile dockerConfigFile = readDockerConfig(); + final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext(); + applyContextConfiguration(context); SSLConfig sslConfig = null; @@ -417,14 +483,26 @@ public DefaultDockerClientConfig build() { sslConfig = customSslConfig; } - return new DefaultDockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername, + URI dockerHostUri = dockerHost != null + ? dockerHost + : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST); + + return new DefaultDockerClientConfig(dockerHostUri, dockerConfigFile, dockerConfig, apiVersion, registryUrl, registryUsername, registryPassword, registryEmail, sslConfig); } + private DockerConfigFile readDockerConfig() { + try { + return DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig); + } catch (IOException e) { + throw new DockerClientException("Failed to parse docker configuration file", e); + } + } + private String checkDockerCertPath(String dockerCertPath) { if (StringUtils.isEmpty(dockerCertPath)) { throw new DockerClientException( - "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined."); + "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) is not defined."); } File certPath = new File(dockerCertPath); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java new file mode 100644 index 000000000..54722e6c7 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java @@ -0,0 +1,160 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.transport.DockerHttpClient; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.MultimapBuilder; +import com.google.common.collect.SetMultimap; +import com.google.common.escape.Escaper; +import com.google.common.net.UrlEscapers; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +public final class DefaultDockerCmdExecFactory extends AbstractDockerCmdExecFactory { + + private final DockerHttpClient dockerHttpClient; + + private final ObjectMapper objectMapper; + + public DefaultDockerCmdExecFactory( + DockerHttpClient dockerHttpClient, + ObjectMapper objectMapper + ) { + this.dockerHttpClient = dockerHttpClient; + this.objectMapper = objectMapper; + } + + public DockerHttpClient getDockerHttpClient() { + return dockerHttpClient; + } + + @Override + protected WebTarget getBaseResource() { + return new DefaultWebTarget(); + } + + @Override + public void close() throws IOException { + dockerHttpClient.close(); + } + + private class DefaultWebTarget implements WebTarget { + + final ImmutableList path; + + final SetMultimap queryParams; + + DefaultWebTarget() { + this( + ImmutableList.of(), + MultimapBuilder.hashKeys().hashSetValues().build() + ); + } + + DefaultWebTarget( + ImmutableList path, + SetMultimap queryParams + ) { + this.path = path; + this.queryParams = queryParams; + } + + @Override + public String toString() { + return String.format("DefaultWebTarget{path=%s, queryParams=%s}", path, queryParams); + } + + @Override + public InvocationBuilder request() { + String resource = StringUtils.join(path, "/"); + + if (!resource.startsWith("/")) { + resource = "/" + resource; + } + + RemoteApiVersion apiVersion = getDockerClientConfig().getApiVersion(); + if (apiVersion != RemoteApiVersion.UNKNOWN_VERSION) { + resource = "/" + apiVersion.asWebPathPart() + resource; + } + + if (!queryParams.isEmpty()) { + Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper(); + resource = queryParams.asMap().entrySet().stream() + .flatMap(entry -> { + return entry.getValue().stream().map(s -> { + return entry.getKey() + "=" + urlFormParameterEscaper.escape(s); + }); + }) + .collect(Collectors.joining("&", resource + "?", "")); + } + + return new DefaultInvocationBuilder( + dockerHttpClient, objectMapper, resource + ); + } + + @Override + public DefaultWebTarget path(String... components) { + ImmutableList newPath = ImmutableList.builder() + .addAll(path) + .add(components) + .build(); + return new DefaultWebTarget(newPath, queryParams); + } + + @Override + public DefaultWebTarget resolveTemplate(String name, Object value) { + ImmutableList.Builder newPath = ImmutableList.builder(); + for (String component : path) { + component = component.replaceAll( + "\\{" + name + "\\}", + UrlEscapers.urlPathSegmentEscaper().escape(value.toString()) + ); + newPath.add(component); + } + + return new DefaultWebTarget(newPath.build(), queryParams); + } + + @Override + public DefaultWebTarget queryParam(String name, Object value) { + if (value == null) { + return this; + } + + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.put(name, value.toString()); + + return new DefaultWebTarget(path, newQueryParams); + } + + @Override + public DefaultWebTarget queryParamsSet(String name, Set values) { + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet())); + + return new DefaultWebTarget(path, newQueryParams); + } + + @Override + public DefaultWebTarget queryParamsJsonMap(String name, Map values) { + if (values == null || values.isEmpty()) { + return this; + } + + // when param value is JSON string + try { + return queryParam(name, objectMapper.writeValueAsString(values)); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java new file mode 100644 index 000000000..c7525279c --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java @@ -0,0 +1,322 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.MappingIterator; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.BadRequestException; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.InternalServerErrorException; +import com.github.dockerjava.api.exception.NotAcceptableException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.exception.NotModifiedException; +import com.github.dockerjava.api.exception.UnauthorizedException; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.transport.DockerHttpClient; +import org.apache.commons.io.IOUtils; + +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.function.Consumer; + +class DefaultInvocationBuilder implements InvocationBuilder { + + private final DockerHttpClient.Request.Builder requestBuilder; + private final DockerHttpClient dockerHttpClient; + private final ObjectMapper objectMapper; + + DefaultInvocationBuilder(DockerHttpClient dockerHttpClient, ObjectMapper objectMapper, String path) { + this.requestBuilder = DockerHttpClient.Request.builder().path(path); + this.dockerHttpClient = dockerHttpClient; + this.objectMapper = objectMapper; + } + + @Override + public DefaultInvocationBuilder accept(MediaType mediaType) { + return header("accept", mediaType.getMediaType()); + } + + @Override + public DefaultInvocationBuilder header(String name, String value) { + requestBuilder.putHeader(name, value); + return this; + } + + @Override + public void delete() { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.DELETE) + .build(); + + execute(request).close(); + } + + @Override + public void get(ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + executeAndStream( + request, + resultCallback, + new FramedInputStreamConsumer(resultCallback) + ); + } + + @Override + public T get(TypeReference typeReference) { + try (InputStream inputStream = get()) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void get(TypeReference typeReference, ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); + } + + @Override + public InputStream post(Object entity) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .build(); + + DockerHttpClient.Response response = execute(request); + return new FilterInputStream(response.getBody()) { + @Override + public void close() throws IOException { + try { + super.close(); + } finally { + response.close(); + } + } + }; + } + + @Override + public T post(Object entity, TypeReference typeReference) { + try { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .build(); + + try (DockerHttpClient.Response response = execute(request)) { + return objectMapper.readValue(response.getBody(), typeReference); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); + } + + @Override + public T post(TypeReference typeReference, InputStream body) { + try (InputStream inputStream = post(body)) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .hijackedInput(stdin) + .build(); + + executeAndStream( + request, + resultCallback, + new FramedInputStreamConsumer(resultCallback) + ); + } + + @Override + public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .body(body) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); + } + + @Override + public void postStream(InputStream body) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .body(body) + .build(); + + execute(request).close(); + } + + @Override + public InputStream get() { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + DockerHttpClient.Response response = execute(request); + return new FilterInputStream(response.getBody()) { + @Override + public void close() throws IOException { + try { + super.close(); + } finally { + response.close(); + } + } + }; + } + + @Override + public void put(InputStream body, MediaType mediaType) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.PUT) + .putHeader("content-type", mediaType.toString()) + .body(body) + .build(); + + execute(request).close(); + } + + protected DockerHttpClient.Response execute(DockerHttpClient.Request request) { + try { + DockerHttpClient.Response response = dockerHttpClient.execute(request); + int statusCode = response.getStatusCode(); + if (statusCode < 200 || statusCode > 299) { + try { + String body = IOUtils.toString(response.getBody(), StandardCharsets.UTF_8); + switch (statusCode) { + case 304: + throw new NotModifiedException(body); + case 400: + throw new BadRequestException(body); + case 401: + throw new UnauthorizedException(body); + case 404: + throw new NotFoundException(body); + case 406: + throw new NotAcceptableException(body); + case 409: + throw new ConflictException(body); + case 500: + throw new InternalServerErrorException(body); + default: + throw new DockerException(body, statusCode); + } + } finally { + response.close(); + } + } else { + return response; + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + protected void executeAndStream( + DockerHttpClient.Request request, + ResultCallback callback, + Consumer sourceConsumer + ) { + Thread thread = new Thread(() -> { + Thread streamingThread = Thread.currentThread(); + try (DockerHttpClient.Response response = execute(request)) { + callback.onStart(() -> { + streamingThread.interrupt(); + response.close(); + }); + + sourceConsumer.accept(response); + callback.onComplete(); + } catch (Exception e) { + callback.onError(e); + } + }, "docker-java-stream-" + Objects.hashCode(request)); + thread.setDaemon(true); + + thread.start(); + } + + private byte[] encode(Object entity) { + if (entity == null) { + return null; + } + + try { + return objectMapper.writeValueAsBytes(entity); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + private class JsonSink implements Consumer { + + private final TypeReference typeReference; + + private final ResultCallback resultCallback; + + JsonSink(TypeReference typeReference, ResultCallback resultCallback) { + this.typeReference = typeReference; + this.resultCallback = resultCallback; + } + + @Override + public void accept(DockerHttpClient.Response response) { + try { + InputStream body = response.getBody(); + MappingIterator iterator = objectMapper.readerFor(typeReference).readValues(body); + while (iterator.hasNextValue()) { + resultCallback.onNext((T) iterator.nextValue()); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 226b95c05..e3961661a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -3,12 +3,26 @@ */ package com.github.dockerjava.core; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; +import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer; +import com.fasterxml.jackson.databind.module.SimpleModule; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.DockerObject; +import com.github.dockerjava.api.model.DockerObjectAccessor; + +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; /** * Interface that describes the docker client configuration. @@ -18,6 +32,10 @@ */ public interface DockerClientConfig { + static ObjectMapper getDefaultObjectMapper() { + return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy(); + } + URI getDockerHost(); RemoteApiVersion getApiVersion(); @@ -40,7 +58,7 @@ public interface DockerClientConfig { SSLConfig getSSLConfig(); default ObjectMapper getObjectMapper() { - return DefaultObjectMapperHolder.INSTANCE.getObjectMapper(); + return getDefaultObjectMapper(); } } @@ -49,10 +67,77 @@ enum DefaultObjectMapperHolder { private final ObjectMapper objectMapper = new ObjectMapper() // TODO .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL) - // TODO .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + + { + ObjectMapper originalObjectMapper = objectMapper.copy(); + objectMapper.registerModule(new SimpleModule("docker-java") { + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + @Override + public JsonDeserializer modifyDeserializer( + DeserializationConfig config, + BeanDescription beanDescription, + JsonDeserializer originalDeserializer + ) { + if (!beanDescription.getType().isTypeOrSubTypeOf(DockerObject.class)) { + return originalDeserializer; + } + + return new DockerObjectDeserializer( + originalDeserializer, + beanDescription, + originalObjectMapper + ); + } + }); + } + }); + } public ObjectMapper getObjectMapper() { return objectMapper; } } + +class DockerObjectDeserializer extends DelegatingDeserializer { + + private final BeanDescription beanDescription; + + private final ObjectMapper originalMapper; + + DockerObjectDeserializer( + JsonDeserializer delegate, + BeanDescription beanDescription, + ObjectMapper originalMapper + ) { + super(delegate); + this.beanDescription = beanDescription; + this.originalMapper = originalMapper; + } + + @Override + protected JsonDeserializer newDelegatingInstance(JsonDeserializer newDelegatee) { + return new DockerObjectDeserializer(newDelegatee, beanDescription, originalMapper); + } + + @Override + @SuppressWarnings({"deprecation", "unchecked"}) + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + JsonNode jsonNode = p.readValueAsTree(); + + Object deserializedObject = originalMapper.treeToValue(jsonNode, beanDescription.getBeanClass()); + + if (deserializedObject instanceof DockerObject) { + DockerObjectAccessor.overrideRawValues( + ((DockerObject) deserializedObject), + originalMapper.convertValue(jsonNode, HashMap.class) + ); + } + + return deserializedObject; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java new file mode 100644 index 000000000..86c6ac5de --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java @@ -0,0 +1,57 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.AuthConfigurations; + +import java.net.URI; + +@SuppressWarnings("unused") +public class DockerClientConfigDelegate implements DockerClientConfig { + + final DockerClientConfig original; + + public DockerClientConfigDelegate(DockerClientConfig original) { + this.original = original; + } + + public URI getDockerHost() { + return original.getDockerHost(); + } + + public RemoteApiVersion getApiVersion() { + return original.getApiVersion(); + } + + public String getRegistryUsername() { + return original.getRegistryUsername(); + } + + public String getRegistryPassword() { + return original.getRegistryPassword(); + } + + public String getRegistryEmail() { + return original.getRegistryEmail(); + } + + public String getRegistryUrl() { + return original.getRegistryUrl(); + } + + public AuthConfig effectiveAuthConfig(String imageName) { + return original.effectiveAuthConfig(imageName); + } + + public AuthConfigurations getAuthConfigurations() { + return original.getAuthConfigurations(); + } + + public SSLConfig getSSLConfig() { + return original.getSSLConfig(); + } + + public ObjectMapper getObjectMapper() { + return original.getObjectMapper(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 3f06ec0da..a1ddc2897 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -7,9 +7,11 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -23,9 +25,11 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -33,6 +37,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -41,6 +46,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -49,15 +55,20 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -83,9 +94,11 @@ import com.github.dockerjava.core.command.CommitCmdImpl; import com.github.dockerjava.core.command.ConnectToNetworkCmdImpl; import com.github.dockerjava.core.command.ContainerDiffCmdImpl; +import com.github.dockerjava.core.command.ExportContainerCmdImpl; import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl; import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl; import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl; +import com.github.dockerjava.core.command.CreateConfigCmdImpl; import com.github.dockerjava.core.command.CreateContainerCmdImpl; import com.github.dockerjava.core.command.CreateImageCmdImpl; import com.github.dockerjava.core.command.CreateNetworkCmdImpl; @@ -99,15 +112,18 @@ import com.github.dockerjava.core.command.InfoCmdImpl; import com.github.dockerjava.core.command.InitializeSwarmCmdImpl; import com.github.dockerjava.core.command.InpectNetworkCmdImpl; +import com.github.dockerjava.core.command.InspectConfigCmdImpl; import com.github.dockerjava.core.command.InspectContainerCmdImpl; import com.github.dockerjava.core.command.InspectExecCmdImpl; import com.github.dockerjava.core.command.InspectImageCmdImpl; +import com.github.dockerjava.core.command.ImageHistoryCmdImpl; import com.github.dockerjava.core.command.InspectServiceCmdImpl; import com.github.dockerjava.core.command.InspectSwarmCmdImpl; import com.github.dockerjava.core.command.InspectVolumeCmdImpl; import com.github.dockerjava.core.command.JoinSwarmCmdImpl; import com.github.dockerjava.core.command.KillContainerCmdImpl; import com.github.dockerjava.core.command.LeaveSwarmCmdImpl; +import com.github.dockerjava.core.command.ListConfigsCmdImpl; import com.github.dockerjava.core.command.ListContainersCmdImpl; import com.github.dockerjava.core.command.ListImagesCmdImpl; import com.github.dockerjava.core.command.ListNetworksCmdImpl; @@ -116,6 +132,7 @@ import com.github.dockerjava.core.command.ListSwarmNodesCmdImpl; import com.github.dockerjava.core.command.ListTasksCmdImpl; import com.github.dockerjava.core.command.ListVolumesCmdImpl; +import com.github.dockerjava.core.command.LoadImageAsyncCmdImpl; import com.github.dockerjava.core.command.LoadImageCmdImpl; import com.github.dockerjava.core.command.LogContainerCmdImpl; import com.github.dockerjava.core.command.LogSwarmObjectImpl; @@ -124,15 +141,20 @@ import com.github.dockerjava.core.command.PruneCmdImpl; import com.github.dockerjava.core.command.PullImageCmdImpl; import com.github.dockerjava.core.command.PushImageCmdImpl; +import com.github.dockerjava.core.command.RemoveConfigCmdImpl; import com.github.dockerjava.core.command.RemoveContainerCmdImpl; import com.github.dockerjava.core.command.RemoveImageCmdImpl; import com.github.dockerjava.core.command.RemoveNetworkCmdImpl; import com.github.dockerjava.core.command.RemoveSecretCmdImpl; import com.github.dockerjava.core.command.RemoveServiceCmdImpl; +import com.github.dockerjava.core.command.RemoveSwarmNodeCmdImpl; import com.github.dockerjava.core.command.RemoveVolumeCmdImpl; import com.github.dockerjava.core.command.RenameContainerCmdImpl; +import com.github.dockerjava.core.command.ResizeContainerCmdImpl; +import com.github.dockerjava.core.command.ResizeExecCmdImpl; import com.github.dockerjava.core.command.RestartContainerCmdImpl; import com.github.dockerjava.core.command.SaveImageCmdImpl; +import com.github.dockerjava.core.command.SaveImagesCmdImpl; import com.github.dockerjava.core.command.SearchImagesCmdImpl; import com.github.dockerjava.core.command.StartContainerCmdImpl; import com.github.dockerjava.core.command.StatsCmdImpl; @@ -146,14 +168,15 @@ import com.github.dockerjava.core.command.UpdateSwarmNodeCmdImpl; import com.github.dockerjava.core.command.VersionCmdImpl; import com.github.dockerjava.core.command.WaitContainerCmdImpl; +import com.github.dockerjava.transport.DockerHttpClient; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.InputStream; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * @author Konstantin Pelykh (kpelykh@gmail.com) @@ -163,39 +186,71 @@ public class DockerClientImpl implements Closeable, DockerClient { private final DockerClientConfig dockerClientConfig; - private DockerCmdExecFactory dockerCmdExecFactory; + DockerCmdExecFactory dockerCmdExecFactory; - private DockerClientImpl() { - this(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); + DockerClientImpl(DockerClientConfig dockerClientConfig) { + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified"); } - private DockerClientImpl(String serverUrl) { - this(configWithServerUrl(serverUrl)); + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated + public static DockerClientImpl getInstance() { + return new DockerClientImpl(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); } - private DockerClientImpl(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated + public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) { + return new DockerClientImpl(dockerClientConfig); } - private static DockerClientConfig configWithServerUrl(String serverUrl) { - return DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build(); + public static DockerClient getInstance(DockerClientConfig dockerClientConfig, DockerHttpClient dockerHttpClient) { + return new DockerClientImpl(dockerClientConfig) + .withHttpClient(dockerHttpClient); } - public static DockerClientImpl getInstance() { - return new DockerClientImpl(); + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated + public static DockerClientImpl getInstance(String serverUrl) { + return new DockerClientImpl( + DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost(serverUrl) + .build() + ); } - public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) { - return new DockerClientImpl(dockerClientConfig); + DockerClientImpl withHttpClient(DockerHttpClient httpClient) { + return withDockerCmdExecFactory(new DefaultDockerCmdExecFactory(httpClient, dockerClientConfig.getObjectMapper())); } - public static DockerClientImpl getInstance(String serverUrl) { - return new DockerClientImpl(serverUrl); + /** + * + * @return {@link DockerHttpClient} or null if not set + */ + @Nullable + public DockerHttpClient getHttpClient() { + if (dockerCmdExecFactory instanceof DefaultDockerCmdExecFactory) { + return ((DefaultDockerCmdExecFactory) dockerCmdExecFactory).getDockerHttpClient(); + } else { + return null; + } } + /** + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { - checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); + Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); this.dockerCmdExecFactory = dockerCmdExecFactory; if (dockerCmdExecFactory instanceof DockerClientConfigAware) { ((DockerClientConfigAware) dockerCmdExecFactory).init(dockerClientConfig); @@ -203,15 +258,16 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE return this; } + @Deprecated private DockerCmdExecFactory getDockerCmdExecFactory() { - checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); + Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); return dockerCmdExecFactory; } @Override public AuthConfig authConfig() { - checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null."); - checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null."); + Objects.requireNonNull(dockerClientConfig.getRegistryUsername(), "Configured username is null."); + Objects.requireNonNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null."); return new AuthConfig() .withUsername(dockerClientConfig.getRegistryUsername()) @@ -283,6 +339,11 @@ public SaveImageCmd saveImageCmd(String name) { return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name); } + @Override + public SaveImagesCmd saveImagesCmd() { + return new SaveImagesCmdImpl(getDockerCmdExecFactory().createSaveImagesCmdExec()); + } + @Override public CreateImageCmd createImageCmd(String repository, InputStream imageStream) { return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream); @@ -293,6 +354,11 @@ public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) { return new LoadImageCmdImpl(getDockerCmdExecFactory().createLoadImageCmdExec(), imageStream); } + @Override + public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) { + return new LoadImageAsyncCmdImpl(getDockerCmdExecFactory().createLoadImageAsyncCmdExec(), imageStream); + } + @Override public SearchImagesCmd searchImagesCmd(String term) { return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term); @@ -313,6 +379,11 @@ public InspectImageCmd inspectImageCmd(String imageId) { return new InspectImageCmdImpl(getDockerCmdExecFactory().createInspectImageCmdExec(), imageId); } + @Override + public ImageHistoryCmd imageHistoryCmd(String imageId) { + return new ImageHistoryCmdImpl(getDockerCmdExecFactory().createImageHistoryCmdExec(), imageId); + } + /** * * CONTAINER API * */ @@ -343,6 +414,11 @@ public ExecCreateCmd execCreateCmd(String containerId) { return new ExecCreateCmdImpl(getDockerCmdExecFactory().createExecCmdExec(), containerId); } + @Override + public ResizeExecCmd resizeExecCmd(@Nonnull String execId) { + return new ResizeExecCmdImpl(getDockerCmdExecFactory().createResizeExecCmdExec(), execId); + } + @Override public RemoveContainerCmd removeContainerCmd(String containerId) { return new RemoveContainerCmdImpl(getDockerCmdExecFactory().createRemoveContainerCmdExec(), containerId); @@ -396,6 +472,11 @@ public ContainerDiffCmd containerDiffCmd(String containerId) { return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId); } + @Override + public ExportContainerCmd exportContainerCmd(String containerId) { + return new ExportContainerCmdImpl(getDockerCmdExecFactory().createExportContainerCmdExec(), containerId); + } + @Override public StopContainerCmd stopContainerCmd(String containerId) { return new StopContainerCmdImpl(getDockerCmdExecFactory().createStopContainerCmdExec(), containerId); @@ -421,6 +502,11 @@ public RestartContainerCmd restartContainerCmd(String containerId) { return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId); } + @Override + public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) { + return new ResizeContainerCmdImpl(getDockerCmdExecFactory().createResizeContainerCmdExec(), containerId); + } + @Override public CommitCmd commitCmd(String containerId) { return new CommitCmdImpl(getDockerCmdExecFactory().createCommitCmdExec(), containerId); @@ -551,6 +637,11 @@ public UpdateSwarmNodeCmd updateSwarmNodeCmd() { return new UpdateSwarmNodeCmdImpl(getDockerCmdExecFactory().updateSwarmNodeCmdExec()); } + @Override + public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) { + return new RemoveSwarmNodeCmdImpl(getDockerCmdExecFactory().removeSwarmNodeCmdExec(), swarmNodeId); + } + @Override public ListSwarmNodesCmd listSwarmNodesCmd() { return new ListSwarmNodesCmdImpl(getDockerCmdExecFactory().listSwarmNodeCmdExec()); @@ -611,6 +702,28 @@ public RemoveSecretCmd removeSecretCmd(String secretId) { return new RemoveSecretCmdImpl(getDockerCmdExecFactory().createRemoveSecretCmdExec(), secretId); } + @Override + public ListConfigsCmd listConfigsCmd() { + return new ListConfigsCmdImpl(getDockerCmdExecFactory().createListConfigsCmdExec()); + } + + @Override + public CreateConfigCmd createConfigCmd() { + return new CreateConfigCmdImpl(getDockerCmdExecFactory().createCreateConfigCmdExec()); + } + + @Override + public InspectConfigCmd inspectConfigCmd(String configId) { + return new InspectConfigCmdImpl(getDockerCmdExecFactory().createInspectConfigCmdExec(), configId); + } + + + @Override + public RemoveConfigCmd removeConfigCmd(String configId) { + return new RemoveConfigCmdImpl(getDockerCmdExecFactory().createRemoveConfigCmdExec(), configId); + } + + @Override public ListTasksCmd listTasksCmd() { return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java index fd04a5aa6..39ef15271 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java @@ -1,12 +1,14 @@ package com.github.dockerjava.core; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; +import java.util.Objects; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -27,7 +29,10 @@ public class DockerConfigFile { }; @JsonProperty - private final Map auths; + private Map auths; + + @JsonProperty + private String currentContext; public DockerConfigFile() { this(new HashMap<>()); @@ -42,10 +47,23 @@ public Map getAuths() { return auths; } + @JsonSetter + public void setAuths(Map authConfigMap) { + auths = (authConfigMap == null || authConfigMap.size() == 0) ? new HashMap<>() : authConfigMap; + } + void addAuthConfig(AuthConfig config) { auths.put(config.getRegistryAddress(), config); } + void setCurrentContext(String currentContext) { + this.currentContext = currentContext; + } + + public String getCurrentContext() { + return currentContext; + } + @CheckForNull public AuthConfig resolveAuthConfig(@CheckForNull String hostname) { if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) { @@ -104,6 +122,9 @@ public boolean equals(Object obj) { return false; } else if (!auths.equals(other.auths)) return false; + if (!Objects.equals(currentContext, other.currentContext)) { + return false; + } return true; } @@ -111,7 +132,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return "DockerConfigFile [auths=" + auths + "]"; + return "DockerConfigFile [auths=" + auths + ", currentContext='" + currentContext + "']"; } @Nonnull diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java new file mode 100644 index 000000000..e10db4498 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java @@ -0,0 +1,71 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hashing; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Optional; + +public class DockerContextMetaFile { + private static HashFunction metaHashFunction = Hashing.sha256(); + + @JsonProperty("Name") + String name; + + @JsonProperty("Endpoints") + Endpoints endpoints; + + + public static class Endpoints { + @JsonProperty("docker") + Docker docker; + + public static class Docker { + @JsonProperty("Host") + String host; + + @JsonProperty("SkipTLSVerify") + boolean skipTLSVerify; + } + } + + + public static Optional resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) { + final File path = dockerConfigPath.toPath() + .resolve("contexts") + .resolve("meta") + .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString()) + .resolve("meta.json") + .toFile(); + return Optional.ofNullable(loadContextMetaFile(objectMapper, path)); + } + + public static Optional resolveContextTLSFile(File dockerConfigPath, String context) { + final File path = dockerConfigPath.toPath() + .resolve("contexts") + .resolve("tls") + .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString()) + .resolve("docker") + .toFile(); + return Optional.ofNullable(path).filter(File::exists); + } + + public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) { + try { + return parseContextMetaFile(objectMapper, dockerContextMetaFile); + } catch (Exception exception) { + return null; + } + } + + public static DockerContextMetaFile parseContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) throws IOException { + try { + return objectMapper.readValue(dockerContextMetaFile, DockerContextMetaFile.class); + } catch (IOException e) { + throw new IOException("Failed to parse docker context meta file " + dockerContextMetaFile, e); + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java new file mode 100644 index 000000000..c81521076 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java @@ -0,0 +1,100 @@ +package com.github.dockerjava.core; + +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.api.model.StreamType; +import com.github.dockerjava.transport.DockerHttpClient; + +import java.io.InputStream; +import java.util.Arrays; +import java.util.function.Consumer; + +class FramedInputStreamConsumer implements Consumer { + + private final ResultCallback resultCallback; + + FramedInputStreamConsumer(ResultCallback resultCallback) { + this.resultCallback = resultCallback; + } + + @Override + public void accept(DockerHttpClient.Response response) { + try { + InputStream body = response.getBody(); + + byte[] buffer = new byte[1024]; + while (true) { + // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach + // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT} + + int streamTypeByte = body.read(); + if (streamTypeByte < 0) { + return; + } + + StreamType streamType = streamType(streamTypeByte); + + if (streamType == StreamType.RAW) { + resultCallback.onNext(new Frame(StreamType.RAW, new byte[]{(byte) streamTypeByte})); + + int readBytes; + while ((readBytes = body.read(buffer)) >= 0) { + if (readBytes == buffer.length) { + resultCallback.onNext(new Frame(StreamType.RAW, buffer)); + } else { + resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes))); + } + } + return; + } + + // Skip 3 bytes + for (int i = 0; i < 3; i++) { + if (body.read() < 0) { + return; + } + } + + // uint32 encoded as big endian. + int bytesToRead = 0; + for (int i = 0; i < 4; i++) { + int readByte = body.read(); + if (readByte < 0) { + return; + } + bytesToRead |= (readByte & 0xff) << (8 * (3 - i)); + } + + do { + int readBytes = body.read(buffer, 0, Math.min(buffer.length, bytesToRead)); + if (readBytes < 0) { + // TODO log? + return; + } + + if (readBytes == buffer.length) { + resultCallback.onNext(new Frame(streamType, buffer)); + } else { + resultCallback.onNext(new Frame(streamType, Arrays.copyOf(buffer, readBytes))); + } + bytesToRead -= readBytes; + } while (bytesToRead > 0); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + + private static StreamType streamType(int streamType) { + switch (streamType) { + case 0: + return StreamType.STDIN; + case 1: + return StreamType.STDOUT; + case 2: + return StreamType.STDERR; + default: + return StreamType.RAW; + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java index 445c00120..811b60ce5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java @@ -6,9 +6,15 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.util.concurrent.UncheckedExecutionException; +import org.apache.commons.lang3.StringUtils; import com.github.dockerjava.core.exception.GoLangFileMatchException; @@ -52,6 +58,11 @@ private GoLangFileMatch() { private static final String PATTERN_CHARS_TO_ESCAPE = "\\.[]{}()*+-?^$|"; + private static final LoadingCache PATTERN_CACHE = CacheBuilder.newBuilder() + .expireAfterAccess(1, TimeUnit.HOURS) + .maximumSize(10_000) + .build(CacheLoader.from(GoLangFileMatch::buildPattern)); + public static boolean match(List patterns, File file) { return !match(patterns, file.getPath()).isEmpty(); } @@ -74,7 +85,11 @@ public static List match(List patterns, String name) { } public static boolean match(String pattern, String name) { - return buildPattern(pattern).matcher(name).matches(); + try { + return PATTERN_CACHE.get(pattern).matcher(name).matches(); + } catch (ExecutionException | UncheckedExecutionException e) { + throw new GoLangFileMatchException(e.getCause().getMessage()); + } } private static Pattern buildPattern(String pattern) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java index 43946a53b..73491bb43 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java @@ -1,7 +1,5 @@ package com.github.dockerjava.core; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -14,6 +12,7 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.Objects; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -37,8 +36,7 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable { */ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) { this.keystorePassword = keystorePassword; - checkNotNull(keystore); - this.keystore = keystore; + this.keystore = Objects.requireNonNull(keystore); } /** @@ -54,8 +52,8 @@ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) { */ public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException { - checkNotNull(pfxFile); - checkNotNull(password); + Objects.requireNonNull(pfxFile); + Objects.requireNonNull(password); keystore = KeyStore.getInstance("pkcs12"); try (FileInputStream fs = new FileInputStream(pfxFile)) { keystore.load(fs, password.toCharArray()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java index 6e39f4f94..0f50f561d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java @@ -1,7 +1,5 @@ package com.github.dockerjava.core; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.Serializable; import java.nio.file.Files; @@ -9,6 +7,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.security.Security; +import java.util.Objects; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -29,8 +28,7 @@ public class LocalDirectorySSLConfig implements SSLConfig, Serializable { private final String dockerCertPath; public LocalDirectorySSLConfig(String dockerCertPath) { - checkNotNull(dockerCertPath); - this.dockerCertPath = dockerCertPath; + this.dockerCertPath = Objects.requireNonNull(dockerCertPath); } public String getDockerCertPath() { @@ -66,7 +64,8 @@ public SSLContext getSSLContext() { TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm); trustManagerFactory.init(CertificateUtils.createTrustStore(capem)); - SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); + SSLContext sslContext = SSLContext.getInstance(AccessController.doPrivileged(getSystemProperty("ssl.protocol", + "TLSv1.2"))); sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); return sslContext; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java index ffadb6656..f06adb6d8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java @@ -5,10 +5,10 @@ import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.core.exception.InvalidRepositoryNameException; @@ -22,6 +22,7 @@ private NameParser() { private static final int RepositoryNameTotalLengthMax = 255; private static final String SHA256_SEPARATOR = "@sha256:"; + private static final String COLON_SEPARATOR = ":"; private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*"); @@ -106,6 +107,13 @@ public static HostnameReposName resolveRepositoryName(String reposName) { String[] nameParts = reposName.split("/", 2); if (nameParts.length == 1 || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0].equals("localhost"))) { + if (StringUtils.containsIgnoreCase(reposName, SHA256_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR); + } + + if (StringUtils.contains(reposName, COLON_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR); + } return new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, reposName); } @@ -119,6 +127,10 @@ public static HostnameReposName resolveRepositoryName(String reposName) { reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR); } + if (StringUtils.contains(reposName, COLON_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR); + } + validateRepoName(reposName); return new HostnameReposName(hostname, reposName); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java index 66b5b47f7..373a67332 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java @@ -79,6 +79,7 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_26 = RemoteApiVersion.create(1, 26); public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27); + public static final RemoteApiVersion VERSION_1_28 = RemoteApiVersion.create(1, 28); public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29); public static final RemoteApiVersion VERSION_1_30 = RemoteApiVersion.create(1, 30); public static final RemoteApiVersion VERSION_1_31 = RemoteApiVersion.create(1, 31); @@ -89,6 +90,11 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_36 = RemoteApiVersion.create(1, 36); public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37); public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38); + public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40); + public static final RemoteApiVersion VERSION_1_41 = RemoteApiVersion.create(1, 41); + public static final RemoteApiVersion VERSION_1_42 = RemoteApiVersion.create(1, 42); + public static final RemoteApiVersion VERSION_1_43 = RemoteApiVersion.create(1, 43); + public static final RemoteApiVersion VERSION_1_44 = RemoteApiVersion.create(1, 44); /** diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java index 0346aa610..c3a05efb2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java @@ -1,22 +1,10 @@ package com.github.dockerjava.core; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; - -import javax.net.ssl.SSLContext; - /** - * Get an SSL Config. Allows for various different implementations. + * + * @deprecated use {@link com.github.dockerjava.transport.SSLConfig} */ -public interface SSLConfig { +@Deprecated +public interface SSLConfig extends com.github.dockerjava.transport.SSLConfig { - /** - * Get the SSL Context, from wherever it comes (file, keystore). - * - * @return an SSL context. - */ - SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException, - KeyStoreException; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java index 3070930d6..4c3136417 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java @@ -16,6 +16,8 @@ * @author Marcus Linke * */ +@SuppressWarnings("unused") +@Deprecated public class FrameStreamProcessor implements ResponseStreamProcessor { @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 7ad1c135a..6bc5ad385 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -9,34 +9,38 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.core.DockerClientConfig; /** * * @author Marcus Linke * */ +@SuppressWarnings("unused") +@Deprecated public class JsonStreamProcessor implements ResponseStreamProcessor { private static final JsonFactory JSON_FACTORY = new JsonFactory(); - private final Class clazz; + private final TypeReference typeReference; private final ObjectMapper objectMapper; @Deprecated public JsonStreamProcessor(Class clazz) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), - clazz + DockerClientConfig.getDefaultObjectMapper(), + new TypeReference() { + } ); } - public JsonStreamProcessor(ObjectMapper objectMapper, Class clazz) { - this.clazz = clazz; + public JsonStreamProcessor(ObjectMapper objectMapper, TypeReference typeReference) { + this.typeReference = typeReference; this.objectMapper = objectMapper.copy().enable(JsonParser.Feature.AUTO_CLOSE_SOURCE); } @@ -54,7 +58,7 @@ public void processResponseStream(InputStream response, ResultCallback result ObjectNode objectNode = objectMapper.readTree(jp); // exclude empty item serialization into class #461 if (!objectNode.isEmpty(null)) { - T next = objectMapper.treeToValue(objectNode, clazz); + T next = objectMapper.convertValue(objectNode, typeReference); resultCallback.onNext(next); } } catch (Exception e) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java index 5849fc3fb..9f83c0b4f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.AsyncDockerCmd; @@ -9,11 +9,10 @@ public abstract class AbstrAsyncDockerCmd, A_RES_T> implements AsyncDockerCmd { - protected DockerCmdAsyncExec execution; + protected transient DockerCmdAsyncExec execution; public AbstrAsyncDockerCmd(DockerCmdAsyncExec execution) { - checkNotNull(execution, "execution was not specified"); - this.execution = execution; + this.execution = Objects.requireNonNull(execution, "execution was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index b2c9d36ce..17ff9a88e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -1,12 +1,11 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.util.Base64; +import java.util.Objects; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,11 +20,10 @@ public abstract class AbstrDockerCmd, RES_T> impl private static final Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class); - protected DockerCmdSyncExec execution; + protected transient DockerCmdSyncExec execution; public AbstrDockerCmd(DockerCmdSyncExec execution) { - checkNotNull(execution, "execution was not specified"); - this.execution = execution; + this.execution = Objects.requireNonNull(execution, "execution was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java index 6c5103b27..30a411dba 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.AttachContainerCmd; import com.github.dockerjava.api.model.Frame; @@ -61,7 +60,7 @@ public InputStream getStdin() { @Override public AttachContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); + Objects.requireNonNull(containerId, "containerId was not specified"); this.containerId = containerId; return this; } @@ -92,8 +91,7 @@ public AttachContainerCmd withStdErr(Boolean stderr) { @Override public AttachContainerCmd withStdIn(InputStream stdin) { - checkNotNull(stdin, "stdin was not specified"); - this.stdin = stdin; + this.stdin = Objects.requireNonNull(stdin, "stdin was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java index bddddfd4f..1e4d22cc8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java @@ -13,7 +13,9 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ +@Deprecated public class AttachContainerResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java index cf24c0014..5d9e62909 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java @@ -1,23 +1,21 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import com.github.dockerjava.api.command.BuildImageCmd; +import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.BuildResponseItem; +import com.github.dockerjava.core.dockerfile.Dockerfile; +import com.github.dockerjava.core.util.FilePathUtil; +import javax.annotation.CheckForNull; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; -import com.github.dockerjava.core.dockerfile.Dockerfile; -import com.github.dockerjava.core.util.FilePathUtil; - -import javax.annotation.CheckForNull; - /** * Build an image from Dockerfile. */ @@ -72,13 +70,15 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd extraHosts; + public BuildImageCmdImpl(BuildImageCmd.Exec exec) { super(exec); } public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) { super(exec); - checkNotNull(dockerFileOrFolder, "dockerFolder is null"); + Objects.requireNonNull(dockerFileOrFolder, "dockerFolder is null"); if (dockerFileOrFolder.isDirectory()) { withBaseDirectory(dockerFileOrFolder); @@ -90,7 +90,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) { public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) { super(exec); - checkNotNull(tarInputStream, "tarInputStream is null"); + Objects.requireNonNull(tarInputStream, "tarInputStream is null"); withTarInputStream(tarInputStream); } @@ -218,6 +218,11 @@ public Long getShmsize() { return shmsize; } + @Override + public Set getExtraHosts() { + return extraHosts; + } + // setters /** @@ -226,8 +231,7 @@ public Long getShmsize() { @Deprecated @Override public BuildImageCmdImpl withTag(String tag) { - checkNotNull(tag, "Tag is null"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "Tag is null"); return this; } @@ -322,7 +326,7 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) { @Override public BuildImageCmdImpl withDockerfile(File dockerfile) { - checkNotNull(dockerfile); + Objects.requireNonNull(dockerfile); if (!dockerfile.exists()) { throw new IllegalArgumentException("Dockerfile does not exist"); } @@ -347,22 +351,19 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) { @Override public BuildImageCmd withDockerfilePath(String dockerfilePath) { - checkNotNull(dockerfilePath, "dockerfilePath is null"); - this.dockerFilePath = dockerfilePath; + this.dockerFilePath = Objects.requireNonNull(dockerfilePath, "dockerfilePath is null"); return this; } @Override public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) { - checkNotNull(tarInputStream, "tarInputStream is null"); - this.tarInputStream = tarInputStream; + this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream is null"); return this; } @Override public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) { - checkNotNull(authConfigs, "authConfig is null"); - this.buildAuthConfigs = authConfigs; + this.buildAuthConfigs = Objects.requireNonNull(authConfigs, "authConfig is null"); return this; } @@ -402,6 +403,12 @@ public BuildImageCmd withTarget(String target) { return this; } + @Override + public BuildImageCmd withExtraHosts(Set extraHosts) { + this.extraHosts = extraHosts; + return this; + } + @Override public void close() { super.close(); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java index e622c4725..f94a751d4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java @@ -3,20 +3,21 @@ */ package com.github.dockerjava.core.command; -import java.util.concurrent.TimeUnit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.BuildResponseItem; import com.github.dockerjava.core.async.ResultCallbackTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.TimeUnit; /** * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.command.BuildImageResultCallback} */ +@Deprecated public class BuildImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java index 1c8ad26a4..8458c7f7e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Map; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CommitCmd; @@ -90,8 +89,7 @@ public String getContainerId() { @Override public CommitCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @@ -140,8 +138,7 @@ public CommitCmdImpl withAttachStdout(Boolean attachStdout) { @Override public CommitCmdImpl withCmd(String... cmd) { - checkNotNull(cmd, "cmd was not specified"); - this.cmd = cmd; + this.cmd = Objects.requireNonNull(cmd, "cmd was not specified"); return this; } @@ -153,29 +150,25 @@ public CommitCmdImpl withDisableNetwork(Boolean disableNetwork) { @Override public CommitCmdImpl withAuthor(String author) { - checkNotNull(author, "author was not specified"); - this.author = author; + this.author = Objects.requireNonNull(author, "author was not specified"); return this; } @Override public CommitCmdImpl withMessage(String message) { - checkNotNull(message, "message was not specified"); - this.message = message; + this.message = Objects.requireNonNull(message, "message was not specified"); return this; } @Override public CommitCmdImpl withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } @Override public CommitCmdImpl withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @@ -192,8 +185,7 @@ public String[] getEnv() { @Override public CommitCmdImpl withEnv(String... env) { - checkNotNull(env, "env was not specified"); - this.env = env; + this.env = Objects.requireNonNull(env, "env was not specified"); return this; } @@ -215,8 +207,7 @@ public ExposedPorts getExposedPorts() { @Override public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); - this.exposedPorts = exposedPorts; + this.exposedPorts = Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); return this; } @@ -227,8 +218,7 @@ public String getHostname() { @Override public CommitCmdImpl withHostname(String hostname) { - checkNotNull(hostname, "hostname was not specified"); - this.hostname = hostname; + this.hostname = Objects.requireNonNull(hostname, "hostname was not specified"); return this; } @@ -239,8 +229,7 @@ public Integer getMemory() { @Override public CommitCmdImpl withMemory(Integer memory) { - checkNotNull(memory, "memory was not specified"); - this.memory = memory; + this.memory = Objects.requireNonNull(memory, "memory was not specified"); return this; } @@ -251,8 +240,7 @@ public Integer getMemorySwap() { @Override public CommitCmdImpl withMemorySwap(Integer memorySwap) { - checkNotNull(memorySwap, "memorySwap was not specified"); - this.memorySwap = memorySwap; + this.memorySwap = Objects.requireNonNull(memorySwap, "memorySwap was not specified"); return this; } @@ -263,8 +251,7 @@ public Boolean isOpenStdin() { @Override public CommitCmdImpl withOpenStdin(Boolean openStdin) { - checkNotNull(openStdin, "openStdin was not specified"); - this.openStdin = openStdin; + this.openStdin = Objects.requireNonNull(openStdin, "openStdin was not specified"); return this; } @@ -275,8 +262,7 @@ public String[] getPortSpecs() { @Override public CommitCmdImpl withPortSpecs(String... portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); - this.portSpecs = portSpecs; + this.portSpecs = Objects.requireNonNull(portSpecs, "portSpecs was not specified"); return this; } @@ -309,8 +295,7 @@ public String getUser() { @Override public CommitCmdImpl withUser(String user) { - checkNotNull(user, "user was not specified"); - this.user = user; + this.user = Objects.requireNonNull(user, "user was not specified"); return this; } @@ -321,8 +306,7 @@ public Volumes getVolumes() { @Override public CommitCmdImpl withVolumes(Volumes volumes) { - checkNotNull(volumes, "volumes was not specified"); - this.volumes = volumes; + this.volumes = Objects.requireNonNull(volumes, "volumes was not specified"); return this; } @@ -333,8 +317,7 @@ public String getWorkingDir() { @Override public CommitCmdImpl withWorkingDir(String workingDir) { - checkNotNull(workingDir, "workingDir was not specified"); - this.workingDir = workingDir; + this.workingDir = Objects.requireNonNull(workingDir, "workingDir was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java index eb6baa5ab..14fc683ce 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; +import java.util.Objects; import com.github.dockerjava.api.command.ContainerDiffCmd; import com.github.dockerjava.api.exception.DockerException; @@ -33,8 +32,7 @@ public String getContainerId() { @Override public ContainerDiffCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java index 8ca305616..e827b37c8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -37,15 +36,13 @@ public String getResource() { @Override public CopyArchiveFromContainerCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public CopyArchiveFromContainerCmdImpl withResource(String resource) { - checkNotNull(resource, "resource was not specified"); - this.resource = resource; + this.resource = Objects.requireNonNull(resource, "resource was not specified"); return this; } @@ -56,8 +53,7 @@ public String getHostPath() { @Override public CopyArchiveFromContainerCmdImpl withHostPath(String hostPath) { - checkNotNull(hostPath, "hostPath was not specified"); - this.hostPath = hostPath; + this.hostPath = Objects.requireNonNull(hostPath, "hostPath was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java index 2eb5f5835..a9b42e921 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java @@ -1,15 +1,14 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.exception.DockerClientException; @@ -31,6 +30,8 @@ public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd implements CreateConfigCmd { + + @JsonProperty("Name") + private String name; + + @JsonProperty("Data") + private String data; + + @JsonProperty("Labels") + private Map labels; + + @Override + public String getName() { + return name; + } + + @Override + public String getData() { + return data; + } + + @Override + public Map getLabels() { + return labels; + } + + public CreateConfigCmdImpl(CreateConfigCmd.Exec exec) { + super(exec); + } + + @Override + public CreateConfigCmd withName(String name) { + this.name = Objects.requireNonNull(name, "name was not specified"); + return this; + } + + @Override + public CreateConfigCmd withData(byte[] data) { + Objects.requireNonNull(data, "data was not specified"); + this.data = Base64.getEncoder().encodeToString(data); + return this; + } + + @Override + public CreateConfigCmd withLabels(Map labels) { + this.labels = Objects.requireNonNull(labels, "labels was not specified"); + return this; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index 1360598de..9b7f8a8fe 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -1,46 +1,42 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.Bind; -import com.github.dockerjava.api.model.Capability; import com.github.dockerjava.api.model.ContainerNetwork; -import com.github.dockerjava.api.model.Device; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.ExposedPorts; import com.github.dockerjava.api.model.HealthCheck; import com.github.dockerjava.api.model.HostConfig; -import com.github.dockerjava.api.model.Link; -import com.github.dockerjava.api.model.LogConfig; -import com.github.dockerjava.api.model.LxcConf; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.api.model.RestartPolicy; -import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.Volumes; -import com.github.dockerjava.api.model.VolumesFrom; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; -import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.singletonMap; /** * Creates a new container. * `/containers/create` */ +@JsonAutoDetect( + fieldVisibility = JsonAutoDetect.Visibility.NONE, + setterVisibility = JsonAutoDetect.Visibility.NONE, + getterVisibility = JsonAutoDetect.Visibility.NONE, + isGetterVisibility = JsonAutoDetect.Visibility.NONE, + creatorVisibility = JsonAutoDetect.Visibility.NONE +) public class CreateContainerCmdImpl extends AbstrDockerCmd implements CreateContainerCmd { @@ -133,17 +129,16 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd aliases = null; private AuthConfig authConfig; + private String platform; + public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) { super(exec); withAuthConfig(authConfig); @@ -160,49 +155,10 @@ public CreateContainerCmd withAuthConfig(AuthConfig authConfig) { } @Override - @JsonIgnore public List getAliases() { return aliases; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Bind[] getBinds() { - return hostConfig.getBinds(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getBlkioWeight() { - return hostConfig.getBlkioWeight(); - } - - @Override - @Deprecated - public CreateContainerCmd withBinds(Bind... binds) { - checkNotNull(binds, "binds was not specified"); - hostConfig.setBinds(binds); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withBinds(List binds) { - checkNotNull(binds, "binds was not specified"); - return withBinds(binds.toArray(new Bind[binds.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withBlkioWeight(Integer blkioWeight) { - hostConfig.withBlkioWeight(blkioWeight); - return this; - } - @Override public CreateContainerCmd withAliases(String... aliases) { this.aliases = Arrays.asList(aliases); @@ -211,7 +167,7 @@ public CreateContainerCmd withAliases(String... aliases) { @Override public CreateContainerCmd withAliases(List aliases) { - checkNotNull(aliases, "aliases was not specified"); + Objects.requireNonNull(aliases, "aliases was not specified"); this.aliases = aliases; return this; } @@ -222,153 +178,19 @@ public String[] getCmd() { return cmd; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getCpuPeriod() { - Long result = hostConfig.getCpuPeriod(); - return result != null ? result.intValue() : null; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getCpuShares() { - return hostConfig.getCpuShares(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCpusetCpus() { - return hostConfig.getCpusetCpus(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCpusetMems() { - return hostConfig.getCpusetMems(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Device[] getDevices() { - return hostConfig.getDevices(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getDns() { - return hostConfig.getDns(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getDnsSearch() { - return hostConfig.getDnsSearch(); - } - @Override public CreateContainerCmd withCmd(String... cmd) { - checkNotNull(cmd, "cmd was not specified"); + Objects.requireNonNull(cmd, "cmd was not specified"); this.cmd = cmd; return this; } @Override public CreateContainerCmd withCmd(List cmd) { - checkNotNull(cmd, "cmd was not specified"); + Objects.requireNonNull(cmd, "cmd was not specified"); return withCmd(cmd.toArray(new String[0])); } - @Override - @Deprecated - public CreateContainerCmd withContainerIDFile(String containerIDFile) { - hostConfig.withContainerIDFile(containerIDFile); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) { - hostConfig.withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpuShares(Integer cpuShares) { - hostConfig.withCpuShares(cpuShares); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpusetCpus(String cpusetCpus) { - hostConfig.withCpusetCpus(cpusetCpus); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpusetMems(String cpusetMems) { - hostConfig.withCpusetMems(cpusetMems); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDevices(Device... devices) { - hostConfig.withDevices(devices); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDevices(List devices) { - hostConfig.withDevices(devices); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDns(String... dns) { - hostConfig.withDns(dns); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDns(List dns) { - hostConfig.withDns(dns); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDnsSearch(String... dnsSearch) { - hostConfig.withDnsSearch(dnsSearch); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDnsSearch(List dnsSearch) { - hostConfig.withDnsSearch(dnsSearch); - return this; - } - @CheckForNull public HealthCheck getHealthcheck() { return healthcheck; @@ -395,7 +217,7 @@ public String getDomainName() { @Override public CreateContainerCmd withDomainName(String domainName) { - checkNotNull(domainName, "no domainName was specified"); + Objects.requireNonNull(domainName, "no domainName was specified"); this.domainName = domainName; return this; } @@ -407,14 +229,14 @@ public String[] getEntrypoint() { @Override public CreateContainerCmd withEntrypoint(String... entrypoint) { - checkNotNull(entrypoint, "entrypoint was not specified"); + Objects.requireNonNull(entrypoint, "entrypoint was not specified"); this.entrypoint = entrypoint; return this; } @Override public CreateContainerCmd withEntrypoint(List entrypoint) { - checkNotNull(entrypoint, "entrypoint was not specified"); + Objects.requireNonNull(entrypoint, "entrypoint was not specified"); return withEntrypoint(entrypoint.toArray(new String[0])); } @@ -425,40 +247,38 @@ public String[] getEnv() { @Override public CreateContainerCmd withEnv(String... env) { - checkNotNull(env, "env was not specified"); + Objects.requireNonNull(env, "env was not specified"); this.env = env; return this; } @Override public CreateContainerCmd withEnv(List env) { - checkNotNull(env, "env was not specified"); + Objects.requireNonNull(env, "env was not specified"); return withEnv(env.toArray(new String[0])); } @Override - @JsonIgnore public ExposedPort[] getExposedPorts() { return exposedPorts.getExposedPorts(); } @Override public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); + Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); this.exposedPorts = new ExposedPorts(exposedPorts); return this; } @Override public CreateContainerCmd withExposedPorts(List exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); + Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); return withExposedPorts(exposedPorts.toArray(new ExposedPort[0])); } /** * @see #stopSignal */ - @JsonIgnore @Override public String getStopSignal() { return stopSignal; @@ -466,7 +286,7 @@ public String getStopSignal() { @Override public CreateContainerCmd withStopSignal(String stopSignal) { - checkNotNull(stopSignal, "stopSignal wasn't specified."); + Objects.requireNonNull(stopSignal, "stopSignal wasn't specified."); this.stopSignal = stopSignal; return this; } @@ -476,14 +296,6 @@ public Integer getStopTimeout() { return stopTimeout; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Ulimit[] getUlimits() { - return hostConfig.getUlimits(); - } - @Override public CreateContainerCmd withStopTimeout(Integer stopTimeout) { this.stopTimeout = stopTimeout; @@ -497,7 +309,7 @@ public String getHostName() { @Override public CreateContainerCmd withHostName(String hostName) { - checkNotNull(hostName, "no hostName was specified"); + Objects.requireNonNull(hostName, "no hostName was specified"); this.hostName = hostName; return this; } @@ -509,20 +321,19 @@ public String getImage() { @Override public CreateContainerCmd withImage(String image) { - checkNotNull(image, "no image was specified"); + Objects.requireNonNull(image, "no image was specified"); this.image = image; return this; } @Override - @JsonIgnore public Map getLabels() { return labels; } @Override public CreateContainerCmd withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.labels = labels; return this; } @@ -534,97 +345,20 @@ public String getMacAddress() { @Override public CreateContainerCmd withMacAddress(String macAddress) { - checkNotNull(macAddress, "macAddress was not specified"); + Objects.requireNonNull(macAddress, "macAddress was not specified"); this.macAddress = macAddress; return this; } - @Deprecated - @Override - @JsonIgnore - public Long getMemory() { - return hostConfig.getMemory(); - } - - @Deprecated - @Override - public CreateContainerCmd withMemory(Long memory) { - checkNotNull(memory, "memory was not specified"); - hostConfig.withMemory(memory); - return this; - } - - @Deprecated - @Override - @JsonIgnore - public Long getMemorySwap() { - return hostConfig.getMemorySwap(); - } - - @Deprecated - @Override - public CreateContainerCmd withMemorySwap(Long memorySwap) { - checkNotNull(memorySwap, "memorySwap was not specified"); - hostConfig.withMemorySwap(memorySwap); - return this; - } - @Override public String getName() { return name; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getNetworkMode() { - return hostConfig.getNetworkMode(); - } - - @Override - @Deprecated - public CreateContainerCmd withNetworkMode(String networkMode) { - checkNotNull(networkMode, "networkMode was not specified"); - this.hostConfig.withNetworkMode(networkMode); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Ports getPortBindings() { - return hostConfig.getPortBindings(); - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(PortBinding... portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - this.hostConfig.withPortBindings(new Ports(portBindings)); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(List portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - return withPortBindings(portBindings.toArray(new PortBinding[0])); - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(Ports portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - this.hostConfig.withPortBindings(portBindings); - return this; - } - @Override public CreateContainerCmd withName(String name) { - checkNotNull(name, "name was not specified"); + Objects.requireNonNull(name, "name was not specified"); this.name = name; return this; } @@ -636,33 +370,17 @@ public String[] getPortSpecs() { @Override public CreateContainerCmd withPortSpecs(String... portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); + Objects.requireNonNull(portSpecs, "portSpecs was not specified"); this.portSpecs = portSpecs; return this; } @Override public CreateContainerCmd withPortSpecs(List portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); + Objects.requireNonNull(portSpecs, "portSpecs was not specified"); return withPortSpecs(portSpecs.toArray(new String[0])); } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getPrivileged() { - return hostConfig.getPrivileged(); - } - - @Override - @Deprecated - public CreateContainerCmd withPrivileged(Boolean privileged) { - checkNotNull(privileged, "no privileged was specified"); - this.hostConfig.withPrivileged(privileged); - return this; - } - @Override public String getUser() { return user; @@ -670,7 +388,7 @@ public String getUser() { @Override public CreateContainerCmd withUser(String user) { - checkNotNull(user, "user was not specified"); + Objects.requireNonNull(user, "user was not specified"); this.user = user; return this; } @@ -682,7 +400,7 @@ public Boolean isAttachStderr() { @Override public CreateContainerCmd withAttachStderr(Boolean attachStderr) { - checkNotNull(attachStderr, "attachStderr was not specified"); + Objects.requireNonNull(attachStderr, "attachStderr was not specified"); this.attachStderr = attachStderr; return this; } @@ -694,7 +412,7 @@ public Boolean isAttachStdin() { @Override public CreateContainerCmd withAttachStdin(Boolean attachStdin) { - checkNotNull(attachStdin, "attachStdin was not specified"); + Objects.requireNonNull(attachStdin, "attachStdin was not specified"); this.attachStdin = attachStdin; return this; } @@ -706,53 +424,29 @@ public Boolean isAttachStdout() { @Override public CreateContainerCmd withAttachStdout(Boolean attachStdout) { - checkNotNull(attachStdout, "attachStdout was not specified"); + Objects.requireNonNull(attachStdout, "attachStdout was not specified"); this.attachStdout = attachStdout; return this; } @Override - @JsonIgnore public Volume[] getVolumes() { return volumes.getVolumes(); } @Override public CreateContainerCmd withVolumes(Volume... volumes) { - checkNotNull(volumes, "volumes was not specified"); + Objects.requireNonNull(volumes, "volumes was not specified"); this.volumes = new Volumes(volumes); return this; } @Override public CreateContainerCmd withVolumes(List volumes) { - checkNotNull(volumes, "volumes was not specified"); + Objects.requireNonNull(volumes, "volumes was not specified"); return withVolumes(volumes.toArray(new Volume[0])); } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public VolumesFrom[] getVolumesFrom() { - return hostConfig.getVolumesFrom(); - } - - @Override - @Deprecated - public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) { - checkNotNull(volumesFrom, "volumesFrom was not specified"); - this.hostConfig.withVolumesFrom(volumesFrom); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withVolumesFrom(List volumesFrom) { - checkNotNull(volumesFrom, "volumesFrom was not specified"); - return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()])); - } - @Override public String getWorkingDir() { return workingDir; @@ -760,7 +454,7 @@ public String getWorkingDir() { @Override public CreateContainerCmd withWorkingDir(String workingDir) { - checkNotNull(workingDir, "workingDir was not specified"); + Objects.requireNonNull(workingDir, "workingDir was not specified"); this.workingDir = workingDir; return this; } @@ -772,7 +466,7 @@ public Boolean isNetworkDisabled() { @Override public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) { - checkNotNull(disableNetwork, "disableNetwork was not specified"); + Objects.requireNonNull(disableNetwork, "disableNetwork was not specified"); this.networkDisabled = disableNetwork; return this; } @@ -785,7 +479,7 @@ public Boolean isStdInOnce() { @Override public CreateContainerCmd withStdInOnce(Boolean stdInOnce) { - checkNotNull(stdInOnce, "no stdInOnce was specified"); + Objects.requireNonNull(stdInOnce, "no stdInOnce was specified"); this.stdInOnce = stdInOnce; return this; } @@ -797,7 +491,7 @@ public Boolean isStdinOpen() { @Override public CreateContainerCmd withStdinOpen(Boolean stdinOpen) { - checkNotNull(stdinOpen, "no stdinOpen was specified"); + Objects.requireNonNull(stdinOpen, "no stdinOpen was specified"); this.stdinOpen = stdinOpen; return this; } @@ -810,155 +504,11 @@ public Boolean isTty() { @Override public CreateContainerCmd withTty(Boolean tty) { - checkNotNull(tty, "no tty was specified"); + Objects.requireNonNull(tty, "no tty was specified"); this.tty = tty; return this; } - @Override - @Deprecated - public CreateContainerCmd withUlimits(Ulimit... ulimits) { - hostConfig.withUlimits(ulimits); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withUlimits(List ulimits) { - hostConfig.withUlimits(ulimits); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getPublishAllPorts() { - return hostConfig.getPublishAllPorts(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getReadonlyRootfs() { - return hostConfig.getReadonlyRootfs(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public RestartPolicy getRestartPolicy() { - return hostConfig.getRestartPolicy(); - } - - @Override - @Deprecated - public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) { - checkNotNull(publishAllPorts, "no publishAllPorts was specified"); - this.hostConfig.withPublishAllPorts(publishAllPorts); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { - hostConfig.withReadonlyRootfs(readonlyRootfs); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { - hostConfig.withRestartPolicy(restartPolicy); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getExtraHosts() { - return hostConfig.getExtraHosts(); - } - - @Override - @Deprecated - public CreateContainerCmd withExtraHosts(String... extraHosts) { - checkNotNull(extraHosts, "extraHosts was not specified"); - this.hostConfig.withExtraHosts(extraHosts); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withExtraHosts(List extraHosts) { - checkNotNull(extraHosts, "extraHosts was not specified"); - return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()])); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Capability[] getCapAdd() { - return hostConfig.getCapAdd(); - } - - @Override - @Deprecated - public CreateContainerCmd withCapAdd(Capability... capAdd) { - checkNotNull(capAdd, "capAdd was not specified"); - hostConfig.withCapAdd(capAdd); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCapAdd(List capAdd) { - checkNotNull(capAdd, "capAdd was not specified"); - return withCapAdd(capAdd.toArray(new Capability[capAdd.size()])); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Capability[] getCapDrop() { - return hostConfig.getCapDrop(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCgroupParent() { - return hostConfig.getCgroupParent(); - } - - @Override - @Deprecated - public CreateContainerCmd withCapDrop(Capability... capDrop) { - checkNotNull(capDrop, "capDrop was not specified"); - hostConfig.withCapDrop(capDrop); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCapDrop(List capDrop) { - checkNotNull(capDrop, "capDrop was not specified"); - return withCapDrop(capDrop.toArray(new Capability[capDrop.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withCgroupParent(String cgroupParent) { - hostConfig.withCgroupParent(cgroupParent); - return this; - } - @Override public HostConfig getHostConfig() { return hostConfig; @@ -977,71 +527,11 @@ public String getIpv4Address() { @Override public CreateContainerCmd withIpv4Address(String ipv4Address) { - checkNotNull(ipv4Address, "no ipv4Address was specified"); + Objects.requireNonNull(ipv4Address, "no ipv4Address was specified"); this.ipv4Address = ipv4Address; return this; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Link[] getLinks() { - return hostConfig.getLinks(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public LogConfig getLogConfig() { - return hostConfig.getLogConfig(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public LxcConf[] getLxcConf() { - return hostConfig.getLxcConf(); - } - - @Override - @Deprecated - public CreateContainerCmd withLinks(Link... links) { - checkNotNull(links, "links was not specified"); - this.hostConfig.setLinks(links); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLinks(List links) { - checkNotNull(links, "links was not specified"); - return withLinks(links.toArray(new Link[links.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withLogConfig(LogConfig logConfig) { - hostConfig.withLogConfig(logConfig); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLxcConf(LxcConf... lxcConf) { - hostConfig.withLxcConf(lxcConf); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLxcConf(List lxcConf) { - hostConfig.withLxcConf(lxcConf.toArray(new LxcConf[0])); - return this; - } - @Override public String getIpv6Address() { return ipv6Address; @@ -1049,7 +539,7 @@ public String getIpv6Address() { @Override public CreateContainerCmd withIpv6Address(String ipv6Address) { - checkNotNull(ipv6Address, "no ipv6Address was specified"); + Objects.requireNonNull(ipv6Address, "no ipv6Address was specified"); this.ipv6Address = ipv6Address; return this; } @@ -1059,38 +549,20 @@ public List getOnBuild() { return onBuild; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getOomKillDisable() { - return hostConfig.getOomKillDisable(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getPidMode() { - return hostConfig.getPidMode(); - } - public CreateContainerCmdImpl withOnBuild(List onBuild) { this.onBuild = onBuild; return this; } + @CheckForNull @Override - @Deprecated - public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { - hostConfig.withOomKillDisable(oomKillDisable); - return this; + public String getPlatform() { + return platform; } @Override - @Deprecated - public CreateContainerCmd withPidMode(String pidMode) { - hostConfig.withPidMode(pidMode); + public CreateContainerCmd withPlatform(String platform) { + this.platform = platform; return this; } @@ -1128,7 +600,7 @@ public CreateContainerResponse exec() throws NotFoundException, ConflictExceptio containerNetwork.withAliases(aliases); } - if (containerNetwork != null) { + if (containerNetwork != null && hostConfig.getNetworkMode() != null) { networkingConfig = new NetworkingConfig() .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork)); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java index 9ecf84430..cab9607d0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateImageResponse; @@ -54,7 +53,7 @@ public InputStream getImageStream() { */ @Override public CreateImageCmdImpl withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); + Objects.requireNonNull(repository, "repository was not specified"); this.repository = repository; return this; } @@ -65,7 +64,7 @@ public CreateImageCmdImpl withRepository(String repository) { */ @Override public CreateImageCmdImpl withImageStream(InputStream imageStream) { - checkNotNull(imageStream, "imageStream was not specified"); + Objects.requireNonNull(imageStream, "imageStream was not specified"); this.imageStream = imageStream; return this; } @@ -76,7 +75,7 @@ public CreateImageCmdImpl withImageStream(InputStream imageStream) { */ @Override public CreateImageCmdImpl withTag(String tag) { - checkNotNull(tag, "tag was not specified"); + Objects.requireNonNull(tag, "tag was not specified"); this.tag = tag; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java index e6cff4c09..db2766796 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -10,8 +11,6 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.api.model.Network.Ipam; -import static com.google.common.base.Preconditions.checkNotNull; - public class CreateNetworkCmdImpl extends AbstrDockerCmd implements CreateNetworkCmd { @@ -147,7 +146,7 @@ public Map getLabels() { */ @Override public CreateNetworkCmd withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.labels = labels; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java index d86b04855..19891325a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java @@ -4,7 +4,7 @@ import com.github.dockerjava.api.command.CreateSecretResponse; import com.github.dockerjava.api.model.SecretSpec; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Creates a new secret @@ -16,7 +16,7 @@ public class CreateSecretCmdImpl extends AbstrDockerCmd labels; + @JsonProperty("Driver") private String driver; @@ -34,6 +36,11 @@ public String getName() { return name; } + @Override + public Map getLabels() { + return labels; + } + @Override public String getDriver() { return driver; @@ -46,21 +53,28 @@ public Map getDriverOpts() { @Override public CreateVolumeCmdImpl withName(String name) { - checkNotNull(name, "name was not specified"); + Objects.requireNonNull(name, "name was not specified"); this.name = name; return this; } + @Override + public CreateVolumeCmdImpl withLabels(Map labels) { + Objects.requireNonNull(labels, "labels was not specified"); + this.labels = labels; + return this; + } + @Override public CreateVolumeCmdImpl withDriver(String driver) { - checkNotNull(driver, "driver was not specified"); + Objects.requireNonNull(driver, "driver was not specified"); this.driver = driver; return this; } @Override public CreateVolumeCmd withDriverOpts(Map driverOpts) { - checkNotNull(driverOpts, "driverOpts was not specified"); + Objects.requireNonNull(driverOpts, "driverOpts was not specified"); this.driverOpts = driverOpts; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java index 230f6dd5a..f578b3a19 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java @@ -1,9 +1,8 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; import java.util.Map; +import java.util.Objects; import com.github.dockerjava.api.command.EventsCmd; import com.github.dockerjava.api.model.Event; @@ -38,35 +37,42 @@ public EventsCmd withUntil(String until) { @Override public EventsCmd withContainerFilter(String... container) { - checkNotNull(container, "container have not been specified"); + Objects.requireNonNull(container, "container have not been specified"); this.filters.withContainers(container); return this; } @Override public EventsCmd withImageFilter(String... image) { - checkNotNull(image, "image have not been specified"); + Objects.requireNonNull(image, "image have not been specified"); this.filters.withImages(image); return this; } @Override public EventsCmd withEventFilter(String... event) { - checkNotNull(event, "event have not been specified"); + Objects.requireNonNull(event, "event have not been specified"); this.filters.withFilter("event", event); return this; } + @Override + public EventsCmd withEventTypeFilter(String... eventTypes) { + Objects.requireNonNull(eventTypes, "event types have not been specified"); + this.filters.withEventTypes(eventTypes); + return this; + } + @Override public EventsCmd withLabelFilter(String... label) { - checkNotNull(label, "label have not been specified"); + Objects.requireNonNull(label, "label have not been specified"); this.filters.withLabels(label); return this; } @Override public EventsCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java index cd6205f6d..e6df7fbc1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java @@ -13,7 +13,9 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ +@Deprecated public class EventsResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java index dc410f78b..8ea6e275f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ExecCreateCmd; @@ -59,8 +58,7 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) { @Override public ExecCreateCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java index 9ab3bfb8e..d5990ef80 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,8 +36,7 @@ public String getExecId() { @Override public ExecStartCmd withExecId(String execId) { - checkNotNull(execId, "execId was not specified"); - this.execId = execId; + this.execId = Objects.requireNonNull(execId, "execId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java index 847d62057..39c0e1e8c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java @@ -1,19 +1,20 @@ package com.github.dockerjava.core.command; -import java.io.IOException; -import java.io.OutputStream; - +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.async.ResultCallbackTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.async.ResultCallbackTemplate; +import java.io.IOException; +import java.io.OutputStream; /** * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ +@Deprecated public class ExecStartResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java new file mode 100644 index 000000000..92070a2e2 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java @@ -0,0 +1,41 @@ +package com.github.dockerjava.core.command; + +import java.io.InputStream; +import java.util.Objects; + +import com.github.dockerjava.api.command.ExportContainerCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +/** + * Export the contents of a container as a tar archive. + */ +public class ExportContainerCmdImpl extends AbstrDockerCmd implements + ExportContainerCmd { + + private String containerId; + + public ExportContainerCmdImpl(ExportContainerCmd.Exec exec, String containerId) { + super(exec); + withContainerId(containerId); + } + + @Override + public String getContainerId() { + return containerId; + } + + @Override + public ExportContainerCmdImpl withContainerId(String containerId) { + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such container + */ + @Override + public InputStream exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java index 9c9c31e74..1dc5d3503 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java @@ -14,6 +14,7 @@ *

    * See: {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container} */ +@Deprecated public class FrameReader implements AutoCloseable { private static final int HEADER_SIZE = 8; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java new file mode 100644 index 000000000..fafbd8da1 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java @@ -0,0 +1,42 @@ +package com.github.dockerjava.core.command; + +import java.util.List; +import java.util.Objects; + +import com.github.dockerjava.api.command.ImageHistoryCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ImageHistory; + +/** + * Get the history of an image. + */ +public class ImageHistoryCmdImpl extends AbstrDockerCmd> implements + ImageHistoryCmd { + + private String imageId; + + public ImageHistoryCmdImpl(ImageHistoryCmd.Exec exec, String imageId) { + super(exec); + withImageId(imageId); + } + + @Override + public String getImageId() { + return imageId; + } + + @Override + public ImageHistoryCmd withImageId(String imageId) { + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such image + */ + @Override + public List exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java index 6f81f1bf0..f13f307ad 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.InitializeSwarmCmd; import com.github.dockerjava.api.model.SwarmSpec; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java new file mode 100644 index 000000000..eff4170cb --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java @@ -0,0 +1,40 @@ +package com.github.dockerjava.core.command; + +import java.util.Objects; + +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Config; + +/** + * Inspect the details of a config. + */ +public class InspectConfigCmdImpl extends AbstrDockerCmd implements InspectConfigCmd { + + private String configId; + + public InspectConfigCmdImpl(Exec exec, String configId) { + super(exec); + withConfigId(configId); + } + + @Override + public String getConfigId() { + return configId; + } + + @Override + public InspectConfigCmd withConfigId(String configId) { + this.configId = Objects.requireNonNull(configId, "configId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such config + */ + @Override + public Config exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java index ed3c01b00..ab8c2989a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectContainerResponse; @@ -27,8 +27,7 @@ public String getContainerId() { @Override public InspectContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java index 22d6d70f4..36ad73e28 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java @@ -1,9 +1,10 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectExecResponse; import com.github.dockerjava.api.exception.NotFoundException; -import com.google.common.base.Preconditions; public class InspectExecCmdImpl extends AbstrDockerCmd implements InspectExecCmd { private String execId; @@ -20,8 +21,7 @@ public String getExecId() { @Override public InspectExecCmd withExecId(String execId) { - Preconditions.checkNotNull(execId, "execId was not specified"); - this.execId = execId; + this.execId = Objects.requireNonNull(execId, "execId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java index 48dd30757..5ffa7c5d7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectImageCmd; import com.github.dockerjava.api.command.InspectImageResponse; @@ -26,8 +26,7 @@ public String getImageId() { @Override public InspectImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java index 5b7dcd895..804710ce1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Service; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Inspect the details of a container. */ @@ -26,8 +26,7 @@ public String getServiceId() { @Override public InspectServiceCmd withServiceId(String serviceId) { - checkNotNull(serviceId, "serviceId was not specified"); - this.serviceId = serviceId; + this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java index bf5e5164f..9289878d1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java @@ -6,7 +6,7 @@ import javax.annotation.CheckForNull; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Inspect the details of a swarmNode. @@ -29,8 +29,7 @@ public String getSwarmNodeId() { @Override public InspectSwarmNodeCmd withSwarmNodeId(String swarmNodeId) { - checkNotNull(swarmNodeId, "swarmNodeId was not specified"); - this.swarmNodeId = swarmNodeId; + this.swarmNodeId = Objects.requireNonNull(swarmNodeId, "swarmNodeId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java index c789d91c9..5b76310db 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectVolumeCmd; import com.github.dockerjava.api.command.InspectVolumeResponse; @@ -26,8 +26,7 @@ public String getName() { @Override public InspectVolumeCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java index 72a1cdb82..d19ed8ea2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.JoinSwarmCmd; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import java.util.List; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java index a23d0caa5..bc7207829 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -29,15 +29,13 @@ public String getSignal() { @Override public KillContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public KillContainerCmd withSignal(String signal) { - checkNotNull(signal, "signal was not specified"); - this.signal = signal; + this.signal = Objects.requireNonNull(signal, "signal was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java new file mode 100644 index 000000000..f67dd30b8 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.model.Config; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * List configs. + */ +public class ListConfigsCmdImpl extends AbstrDockerCmd> implements ListConfigsCmd { + + private Map> filters = Collections.emptyMap(); + + public ListConfigsCmdImpl(Exec exec) { + super(exec); + } + + @Override + public Map> getFilters() { + return filters; + } + + public ListConfigsCmd withFilters(Map> filters) { + this.filters = Objects.requireNonNull(filters, "filters was not specified"); + return this; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java index 0d0323a65..94de5daff 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java @@ -7,9 +7,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; /** * List containers. @@ -73,7 +73,7 @@ public ListContainersCmd withShowSize(Boolean showSize) { @Override public ListContainersCmd withLimit(Integer limit) { - checkNotNull(limit, "limit was not specified"); + Objects.requireNonNull(limit, "limit was not specified"); checkArgument(limit > 0, "limit must be greater 0"); this.limit = limit; return this; @@ -81,15 +81,13 @@ public ListContainersCmd withLimit(Integer limit) { @Override public ListContainersCmd withSince(String since) { - checkNotNull(since, "since was not specified"); - this.sinceId = since; + this.sinceId = Objects.requireNonNull(since, "since was not specified"); return this; } @Override public ListContainersCmd withBefore(String before) { - checkNotNull(before, "before was not specified"); - this.beforeId = before; + this.beforeId = Objects.requireNonNull(before, "before was not specified"); return this; } @@ -125,28 +123,28 @@ public ListContainersCmd withLabelFilter(Collection labels) { @Override public ListContainersCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } @Override public ListContainersCmd withExitedFilter(Integer exited) { - checkNotNull(exited, "exited was not specified"); + Objects.requireNonNull(exited, "exited was not specified"); this.filters.withFilter("exited", exited.toString()); return this; } @Override public ListContainersCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filters.withFilter(filterName, filterValues); return this; } @Override public ListContainersCmd withStatusFilter(Collection status) { - checkNotNull(status, "status was not specified"); + Objects.requireNonNull(status, "status was not specified"); this.filters.withFilter("status", status); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index 1033b43ec..40d378c8c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -1,12 +1,13 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.model.Image; @@ -45,32 +46,47 @@ public ListImagesCmd withShowAll(Boolean showAll) { @Override public ListImagesCmd withDanglingFilter(Boolean dangling) { - checkNotNull(dangling, "dangling have not been specified"); - filters.withFilter("dangling", dangling.toString()); + Objects.requireNonNull(dangling, "dangling have not been specified"); + withFilter("dangling", Collections.singletonList(dangling.toString())); return this; } @Override public ListImagesCmd withLabelFilter(String... labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } @Override public ListImagesCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } @Override public ListImagesCmd withImageNameFilter(String imageNameFilter) { - checkNotNull(imageNameFilter, "image name filter not specified"); + Objects.requireNonNull(imageNameFilter, "image name filter not specified"); this.imageNameFilter = imageNameFilter; return this; } + @Override + public ListImagesCmd withReferenceFilter(String reference) { + Objects.requireNonNull(reference, "reference filter not specified"); + withFilter("reference", Collections.singletonList(reference)); + return this; + } + + @Override + public ListImagesCmd withFilter(String key, Collection values) { + Objects.requireNonNull(key, "key not specified"); + Objects.requireNonNull(values, "values not specified"); + filters.withFilter(key, values); + return this; + } + @Override public String getImageNameFilter() { return this.imageNameFilter; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java index 65c13e255..b3be94b8e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java @@ -7,8 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class ListNetworksCmdImpl extends AbstrDockerCmd> implements ListNetworksCmd { @@ -37,7 +36,7 @@ public ListNetworksCmd withNameFilter(String... networkName) { @Override public ListNetworksCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filtersBuilder.withFilter(filterName, filterValues); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java index 5c11a7a19..bed3f9e51 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List services. @@ -28,21 +27,21 @@ public Map> getFilters() { @Override public ListSecretsCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withFilter("id", ids); return this; } @Override public ListSecretsCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withFilter("name", names); return this; } @Override public ListSecretsCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java index c68a0f6d7..1245d14b3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List services. @@ -28,21 +27,21 @@ public Map> getFilters() { @Override public ListServicesCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withFilter("id", ids); return this; } @Override public ListServicesCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withFilter("name", names); return this; } @Override public ListServicesCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java index 5b5c5801f..a35751627 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List SwarmNodes @@ -29,29 +28,29 @@ public Map> getFilters() { @Override public ListSwarmNodesCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withIds(ids); return this; } @Override public ListSwarmNodesCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withNames(names); return this; } @Override public ListSwarmNodesCmd withMembershipFilter(List memberships) { - checkNotNull(memberships, "memberships was not specified"); - this.filters.withNames(memberships); + Objects.requireNonNull(memberships, "memberships was not specified"); + this.filters.withMemberships(memberships); return this; } @Override public ListSwarmNodesCmd withRoleFilter(List roles) { - checkNotNull(roles, "roles was not specified"); - this.filters.withNames(roles); + Objects.requireNonNull(roles, "roles was not specified"); + this.filters.withRoles(roles); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java index b3a18d776..78d39c2c7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java @@ -1,10 +1,9 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import com.github.dockerjava.api.command.ListVolumesCmd; import com.github.dockerjava.api.command.ListVolumesResponse; @@ -30,14 +29,14 @@ public Map> getFilters() { @Override public ListVolumesCmd withDanglingFilter(Boolean dangling) { - checkNotNull(dangling, "dangling have not been specified"); + Objects.requireNonNull(dangling, "dangling have not been specified"); this.filters.withFilter("dangling", dangling.toString()); return this; } @Override public ListVolumesCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filters.withFilter(filterName, filterValues); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java new file mode 100644 index 000000000..3de1dfa4d --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java @@ -0,0 +1,41 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.LoadImageAsyncCmd; +import com.github.dockerjava.api.model.LoadResponseItem; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Objects; + +public class LoadImageAsyncCmdImpl extends AbstrAsyncDockerCmd implements LoadImageAsyncCmd { + + private InputStream inputStream; + + public LoadImageAsyncCmdImpl(LoadImageAsyncCmd.Exec exec, InputStream inputStream) { + super(exec); + this.inputStream = inputStream; + } + + @Override + public InputStream getImageStream() { + return this.inputStream; + } + + @Override + public LoadImageAsyncCmd withImageStream(InputStream imageStream) { + Objects.requireNonNull(imageStream, "imageStream was not specified"); + this.inputStream = imageStream; + return this; + } + + @Override + public void close() { + super.close(); + + try { + this.inputStream.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java index 496ea3176..0b8cbea94 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.LoadImageCmd; @@ -32,8 +31,7 @@ public InputStream getImageStream() { */ @Override public LoadImageCmdImpl withImageStream(@Nonnull InputStream imageStream) { - checkNotNull(imageStream, "imageStream was not specified"); - this.imageStream = imageStream; + this.imageStream = Objects.requireNonNull(imageStream, "imageStream was not specified"); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java index aa267fc8f..65321a318 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java @@ -1,9 +1,9 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.model.Frame; @@ -24,6 +24,8 @@ * @param since * - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: * 0 (unfiltered) + * @param until + * - Only return logs before this time, as a UNIX timestamp. Default: 0 */ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd implements LogContainerCmd { @@ -31,7 +33,7 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd { private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java index a8caf3091..f646e8ced 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.PauseContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -28,8 +28,7 @@ public String getContainerId() { @Override public PauseContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java index a191099ed..e08f64b02 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java @@ -9,8 +9,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Delete unused content (containers, images, volumes, networks, build relicts) @@ -69,28 +68,28 @@ public Map> getFilters() { @Override public PruneCmd withPruneType(final PruneType pruneType) { - checkNotNull(pruneType, "pruneType has not been specified"); + Objects.requireNonNull(pruneType, "pruneType has not been specified"); this.pruneType = pruneType; return this; } @Override public PruneCmd withDangling(Boolean dangling) { - checkNotNull(dangling, "dangling has not been specified"); + Objects.requireNonNull(dangling, "dangling has not been specified"); filters.withFilter("dangling", dangling ? "1" : "0"); return this; } @Override public PruneCmd withUntilFilter(final String until) { - checkNotNull(until, "until has not been specified"); + Objects.requireNonNull(until, "until has not been specified"); filters.withUntil(until); return this; } @Override public PruneCmd withLabelFilter(final String... labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java index a3395c21b..7f70ac3b7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PullResponseItem; -import static com.google.common.base.Preconditions.checkNotNull; - /** * * Pull image from repository. @@ -54,15 +54,13 @@ public String getRegistry() { @Override public PullImageCmd withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @Override public PullImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } @@ -74,8 +72,7 @@ public PullImageCmd withPlatform(String platform) { @Override public PullImageCmd withRegistry(String registry) { - checkNotNull(registry, "registry was not specified"); - this.registry = registry; + this.registry = Objects.requireNonNull(registry, "registry was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java index eb2c30679..67b6b5e48 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java @@ -18,7 +18,9 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.command.PullImageResultCallback} */ +@Deprecated public class PullImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java index b3026c841..8e1fa5cec 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.PushImageCmd; import com.github.dockerjava.api.model.AuthConfig; @@ -42,8 +42,7 @@ public String getTag() { */ @Override public PushImageCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } @@ -53,8 +52,7 @@ public PushImageCmd withName(String name) { */ @Override public PushImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java index 5bfec3bf1..06f1fbc8d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java @@ -16,7 +16,9 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ +@Deprecated public class PushImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java new file mode 100644 index 000000000..e2e7d06fd --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java @@ -0,0 +1,39 @@ +package com.github.dockerjava.core.command; + +import java.util.Objects; + +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +/** + * Remove a config. + */ +public class RemoveConfigCmdImpl extends AbstrDockerCmd implements RemoveConfigCmd { + + private String configId; + + public RemoveConfigCmdImpl(Exec exec, String configId) { + super(exec); + withConfigId(configId); + } + + @Override + public String getConfigId() { + return configId; + } + + @Override + public RemoveConfigCmd withConfigId(String configId) { + this.configId = Objects.requireNonNull(configId, "configId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such secret + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java index 0fc2ab626..cd8f4a9f3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -41,8 +41,7 @@ public Boolean hasForceEnabled() { @Override public RemoveContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java index 038a27f2d..a77357b59 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -38,8 +38,7 @@ public Boolean hasNoPruneEnabled() { @Override public RemoveImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java index 6841d79bd..5c8d0e075 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java @@ -3,7 +3,7 @@ import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Remove a secret. @@ -24,8 +24,7 @@ public String getSecretId() { @Override public RemoveSecretCmd withSecretId(String secretId) { - checkNotNull(secretId, "secretId was not specified"); - this.secretId = secretId; + this.secretId = Objects.requireNonNull(secretId, "secretId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java index 9da85847a..6fed721c7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java @@ -3,7 +3,7 @@ import com.github.dockerjava.api.command.RemoveServiceCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Remove a service. @@ -24,8 +24,7 @@ public String getServiceId() { @Override public RemoveServiceCmd withServiceId(String serviceId) { - checkNotNull(serviceId, "serviceId was not specified"); - this.serviceId = serviceId; + this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java index bf9029e72..ef8a86943 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java @@ -3,11 +3,11 @@ import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.exception.NotFoundException; +import java.util.Objects; + import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Remove a container. */ @@ -17,9 +17,9 @@ public class RemoveSwarmNodeCmdImpl extends AbstrDockerCmd implements RenameContainerCmd { @@ -30,15 +30,13 @@ public String getName() { @Override public RenameContainerCmd withContainerId(@Nonnull String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public RenameContainerCmd withName(@Nonnull String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java new file mode 100644 index 000000000..188802a41 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java @@ -0,0 +1,56 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +import java.util.Objects; + +public class ResizeContainerCmdImpl extends AbstrDockerCmd implements ResizeContainerCmd { + + private String containerId; + + private Integer height; + + private Integer width; + + public ResizeContainerCmdImpl(ResizeContainerCmd.Exec exec, String execId) { + super(exec); + withContainerId(execId); + } + + @Override + public String getContainerId() { + return containerId; + } + + @Override + public Integer getHeight() { + return height; + } + + @Override + public Integer getWidth() { + return width; + } + + @Override + public ResizeContainerCmd withContainerId(String containerId) { + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); + return this; + } + + @Override + public ResizeContainerCmd withSize(int height, int width) { + this.height = height; + this.width = width; + return this; + } + + /** + * @throws NotFoundException no such exec instance + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java new file mode 100644 index 000000000..3aa02c7e9 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java @@ -0,0 +1,57 @@ +package com.github.dockerjava.core.command; + +import java.util.Objects; + +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +public class ResizeExecCmdImpl extends AbstrDockerCmd implements ResizeExecCmd { + + private String execId; + + private Integer height; + + private Integer width; + + public ResizeExecCmdImpl(ResizeExecCmd.Exec exec, String execId) { + super(exec); + withExecId(execId); + } + + @Override + public String getExecId() { + return execId; + } + + @Override + public Integer getHeight() { + return height; + } + + @Override + public Integer getWidth() { + return width; + } + + @Override + public ResizeExecCmd withExecId(String execId) { + this.execId = Objects.requireNonNull(execId, "execId was not specified"); + return this; + } + + @Override + public ResizeExecCmd withSize(int height, int width) { + this.height = height; + this.width = width; + return this; + } + + /** + * @throws NotFoundException no such exec instance + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java index e3621af4f..3b1df465b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java @@ -1,17 +1,19 @@ package com.github.dockerjava.core.command; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Objects; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; +import javax.annotation.CheckForNull; + /** * Restart a running container. * - * @param timeout - * - Timeout in seconds before killing the container. Defaults to 10 seconds. - * + * @param signal - Signal to send to the container as an integer or string (e.g. SIGINT). + * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds. */ public class RestartContainerCmdImpl extends AbstrDockerCmd implements RestartContainerCmd { @@ -19,6 +21,8 @@ public class RestartContainerCmdImpl extends AbstrDockerCmd= 0, "timeout must be greater or equal 0"); this.timeout = timeout; return this; } + @Override + public RestartContainerCmd withSignal(String signal) { + Objects.requireNonNull(signal, "signal was not specified"); + this.signal = signal; + return this; + } + /** - * @throws NotFoundException - * No such container + * @throws NotFoundException No such container */ @Override public Void exec() throws NotFoundException { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java index 333e32df7..0ec72bcc5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.SaveImageCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -33,8 +32,7 @@ public String getTag() { */ @Override public SaveImageCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } @@ -44,8 +42,7 @@ public SaveImageCmd withName(String name) { */ @Override public SaveImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java new file mode 100644 index 000000000..43e11f609 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java @@ -0,0 +1,60 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.google.common.collect.ImmutableList; + +import javax.annotation.Nonnull; +import java.io.InputStream; +import java.util.List; +import java.util.Objects; + +public class SaveImagesCmdImpl extends AbstrDockerCmd implements SaveImagesCmd { + + private static class TaggedImageImpl implements TaggedImage { + private final String name; + private final String tag; + + private TaggedImageImpl(String name, String tag) { + this.name = Objects.requireNonNull(name, "image name was not specified"); + this.tag = Objects.requireNonNull(tag, "image tag was not specified"); + } + + @Override + public String asString() { + return name + ":" + tag; + } + + @Override + public String toString() { + return asString(); + } + } + + private final ImmutableList.Builder taggedImages = ImmutableList.builder(); + + public SaveImagesCmdImpl(final SaveImagesCmd.Exec exec) { + super(exec); + } + + @Override + public SaveImagesCmd withImage(@Nonnull final String name, @Nonnull final String tag) { + taggedImages.add(new TaggedImageImpl(name, tag)); + return this; + } + + + + @Override + public List getImages() { + return taggedImages.build(); + } + + /** + * @throws NotFoundException No such images + */ + @Override + public InputStream exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java index 342a7fbd2..41b8cc844 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java @@ -1,12 +1,15 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkArgument; import java.util.List; +import java.util.Objects; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.model.SearchItem; +import javax.annotation.Nonnull; + /** * Search images * @@ -16,7 +19,11 @@ */ public class SearchImagesCmdImpl extends AbstrDockerCmd> implements SearchImagesCmd { + private static final int MIN_LIMIT = 1; + private static final int MAX_LIMIT = 100; + private String term; + private Integer limit; public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) { super(exec); @@ -30,9 +37,21 @@ public String getTerm() { @Override public SearchImagesCmd withTerm(String term) { - checkNotNull(term, "term was not specified"); - this.term = term; + this.term = Objects.requireNonNull(term, "term was not specified"); return this; } + @Override + public Integer getLimit() { + return limit; + } + + @Override + public SearchImagesCmd withLimit(@Nonnull Integer limit) { + String errorMessage = String.format("Limit %s is outside the range of [%s, %s]", limit, MIN_LIMIT, MAX_LIMIT); + checkArgument(limit <= MAX_LIMIT, errorMessage); + checkArgument(limit >= MIN_LIMIT, errorMessage); + this.limit = limit; + return this; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java index c159c920e..2c0e2c2b8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.dockerjava.api.command.StartContainerCmd; @@ -22,8 +22,7 @@ public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) { @Override public StartContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java index 69d9a02d7..3e24bd5af 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.StatsCmd; import com.github.dockerjava.api.model.Statistics; @@ -12,6 +12,8 @@ public class StatsCmdImpl extends AbstrAsyncDockerCmd impl private String containerId; + private Boolean noStream; + public StatsCmdImpl(StatsCmd.Exec exec, String containerId) { super(exec); withContainerId(containerId); @@ -19,8 +21,7 @@ public StatsCmdImpl(StatsCmd.Exec exec, String containerId) { @Override public StatsCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @@ -29,4 +30,14 @@ public String getContainerId() { return containerId; } + @Override + public Boolean hasNoStream() { + return noStream; + } + + @Override + public StatsCmd withNoStream(boolean noStream) { + this.noStream = noStream; + return this; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java index 7b1e165f5..2cf5e37ae 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java @@ -1,7 +1,8 @@ package com.github.dockerjava.core.command; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Objects; import com.github.dockerjava.api.command.StopContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -39,14 +40,13 @@ public Integer getTimeout() { @Override public StopContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public StopContainerCmd withTimeout(Integer timeout) { - checkNotNull(timeout, "timeout was not specified"); + Objects.requireNonNull(timeout, "timeout was not specified"); checkArgument(timeout >= 0, "timeout must be greater or equal 0"); this.timeout = timeout; return this; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java index c1337112d..f7eebb8a4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.TagImageCmd; @@ -50,22 +50,19 @@ public Boolean hasForceEnabled() { @Override public TagImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } @Override public TagImageCmd withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @Override public TagImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java index 19faed3f2..5f5eee8d0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.TopContainerCmd; import com.github.dockerjava.api.command.TopContainerResponse; @@ -33,15 +33,13 @@ public String getPsArgs() { @Override public TopContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public TopContainerCmd withPsArgs(String psArgs) { - checkNotNull(psArgs, "psArgs was not specified"); - this.psArgs = psArgs; + this.psArgs = Objects.requireNonNull(psArgs, "psArgs was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java index 26e9992b0..ef94c1979 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.UnpauseContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -28,8 +28,7 @@ public String getContainerId() { @Override public UnpauseContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java index aad2b19e3..47ab710eb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java @@ -4,14 +4,21 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.BlkioRateDevice; +import com.github.dockerjava.api.model.BlkioWeightDevice; +import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DeviceRequest; +import com.github.dockerjava.api.model.RestartPolicy; +import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.UpdateContainerResponse; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import java.util.List; /** * @author Kanstantsin Shautsou @@ -28,14 +35,38 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd blkioWeightDevice; + + @JsonProperty("BlkioDeviceReadBps") + private List blkioDeviceReadBps; + + @JsonProperty("BlkioDeviceWriteBps") + private List blkioDeviceWriteBps; + + @JsonProperty("BlkioDeviceReadIOps") + private List blkioDeviceReadIOps; + + @JsonProperty("BlkioDeviceWriteIOps") + private List blkioDeviceWriteIOps; + @JsonProperty("CpuShares") private Integer cpuShares; @JsonProperty("CpuPeriod") - private Integer cpuPeriod; + private Long cpuPeriod; @JsonProperty("CpuQuota") - private Integer cpuQuota; + private Long cpuQuota; + + @JsonProperty("CpuRealtimePeriod") + private Long cpuRealtimePeriod; + + @JsonProperty("CpuRealtimeRuntime") + private Long cpuRealtimeRuntime; + + @JsonProperty("NanoCpus") + private Long nanoCPUs; @JsonProperty("CpusetCpus") private String cpusetCpus; @@ -43,6 +74,18 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd devices; + + @JsonProperty("DeviceCgroupRules") + private List deviceCgroupRules; + + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40} + */ + @JsonProperty("DeviceRequests") + private List deviceRequests; + @JsonProperty("Memory") private Long memory; @@ -55,11 +98,43 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd ulimits; + + @JsonProperty("RestartPolicy") + private RestartPolicy restartPolicy; + public UpdateContainerCmdImpl(UpdateContainerCmd.Exec exec, String containerId) { super(exec); withContainerId(containerId); } + /** + * @see #containerId + */ + @CheckForNull + @JsonIgnore + public String getContainerId() { + return containerId; + } + + /** + * @see #containerId + */ + public UpdateContainerCmd withContainerId(@Nonnull String containerId) { + this.containerId = containerId; + return this; + } + /** * @see #blkioWeight */ @@ -77,19 +152,68 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) { } /** - * @see #containerId + * @see #blkioWeightDevice */ @CheckForNull - @JsonIgnore - public String getContainerId() { - return containerId; + public List getBlkioWeightDevice() { + return blkioWeightDevice; + } + + public UpdateContainerCmd withBlkioWeightDevice(List blkioWeightDevice) { + this.blkioWeightDevice = blkioWeightDevice; + return this; } /** - * @see #containerId + * @see #blkioDeviceReadBps */ - public UpdateContainerCmd withContainerId(@Nonnull String containerId) { - this.containerId = containerId; + @CheckForNull + public List getBlkioDeviceReadBps() { + return blkioDeviceReadBps; + } + + public UpdateContainerCmd withBlkioDeviceReadBps(List blkioDeviceReadBps) { + this.blkioDeviceReadBps = blkioDeviceReadBps; + return this; + } + + /** + * @see #blkioDeviceWriteBps + */ + @CheckForNull + public List getBlkioDeviceWriteBps() { + return blkioDeviceWriteBps; + } + + public UpdateContainerCmd withBlkioDeviceWriteBps(List blkioDeviceWriteBps) { + this.blkioDeviceWriteBps = blkioDeviceWriteBps; + return this; + } + + /** + * @see #blkioDeviceReadIOps + */ + @CheckForNull + public List getBlkioDeviceReadIOps() { + return blkioDeviceReadIOps; + } + + public UpdateContainerCmd withBlkioDeviceReadIOps(List blkioDeviceReadIOps) { + this.blkioDeviceReadIOps = blkioDeviceReadIOps; + return this; + } + + /** + * @see #blkioDeviceWriteIOps + */ + @CheckForNull + public List getBlkioDeviceWriteIOps() { + return blkioDeviceWriteIOps; + } + + @Override + public UpdateContainerCmd withBlkioDeviceWriteIOps(List blkioDeviceWriteIOps) { + this.blkioDeviceWriteIOps = blkioDeviceWriteIOps; return this; } @@ -97,14 +221,14 @@ public UpdateContainerCmd withContainerId(@Nonnull String containerId) { * @see #cpuPeriod */ @CheckForNull - public Integer getCpuPeriod() { + public Long getCpuPeriod() { return cpuPeriod; } /** * @see #cpuPeriod */ - public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) { + public UpdateContainerCmd withCpuPeriod(Long cpuPeriod) { this.cpuPeriod = cpuPeriod; return this; } @@ -113,14 +237,14 @@ public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) { * @see #cpuQuota */ @CheckForNull - public Integer getCpuQuota() { + public Long getCpuQuota() { return cpuQuota; } /** * @see #cpuQuota */ - public UpdateContainerCmd withCpuQuota(Integer cpuQuota) { + public UpdateContainerCmd withCpuQuota(Long cpuQuota) { this.cpuQuota = cpuQuota; return this; } @@ -173,6 +297,71 @@ public UpdateContainerCmd withCpuShares(Integer cpuShares) { return this; } + /** + * @see #cpuRealtimePeriod + */ + @CheckForNull + public Long getCpuRealtimePeriod() { + return cpuRealtimePeriod; + } + + public UpdateContainerCmd withCpuRealtimePeriod(Long cpuRealtimePeriod) { + this.cpuRealtimePeriod = cpuRealtimePeriod; + return this; + } + + /** + * @see #cpuRealtimeRuntime + */ + @CheckForNull + public Long getCpuRealtimeRuntime() { + return cpuRealtimeRuntime; + } + + public UpdateContainerCmd withCpuRealtimeRuntime(Long cpuRealtimeRuntime) { + this.cpuRealtimeRuntime = cpuRealtimeRuntime; + return this; + } + + /** + * @see #devices + */ + @CheckForNull + public List getDevices() { + return devices; + } + + public UpdateContainerCmd withDevices(List devices) { + this.devices = devices; + return this; + } + + /** + * @see #deviceCgroupRules + */ + @CheckForNull + public List getDeviceCgroupRules() { + return deviceCgroupRules; + } + + public UpdateContainerCmd withDeviceCgroupRules(List deviceCgroupRules) { + this.deviceCgroupRules = deviceCgroupRules; + return this; + } + + /** + * @see #deviceRequests + */ + @CheckForNull + public List getDeviceRequests() { + return deviceRequests; + } + + public UpdateContainerCmd withDeviceRequests(List deviceRequests) { + this.deviceRequests = deviceRequests; + return this; + } + /** * @see #kernelMemory */ @@ -237,6 +426,84 @@ public UpdateContainerCmd withMemorySwap(Long memorySwap) { return this; } + /** + * @see #nanoCPUs + */ + @CheckForNull + public Long getNanoCPUs() { + return nanoCPUs; + } + + public UpdateContainerCmd withNanoCPUs(Long nanoCPUs) { + this.nanoCPUs = nanoCPUs; + return this; + } + + /** + * @see #oomKillDisable + */ + @CheckForNull + public Boolean getOomKillDisable() { + return oomKillDisable; + } + + public UpdateContainerCmd withOomKillDisable(Boolean oomKillDisable) { + this.oomKillDisable = oomKillDisable; + return this; + } + + /** + * @see #init + */ + @CheckForNull + public Boolean getInit() { + return init; + } + + public UpdateContainerCmd withInit(Boolean init) { + this.init = init; + return this; + } + + /** + * @see #pidsLimit + */ + @CheckForNull + public Long getPidsLimit() { + return pidsLimit; + } + + public UpdateContainerCmd withPidsLimit(Long pidsLimit) { + this.pidsLimit = pidsLimit; + return this; + } + + /** + * @see #ulimits + */ + @CheckForNull + public List getUlimits() { + return ulimits; + } + + public UpdateContainerCmd withUlimits(List ulimits) { + this.ulimits = ulimits; + return this; + } + + /** + * @see #restartPolicy + */ + @CheckForNull + public RestartPolicy getRestartPolicy() { + return restartPolicy; + } + + public UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { + this.restartPolicy = restartPolicy; + return this; + } + /** * @throws NotFoundException No such container */ diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java index 664ffd997..7ff9412a9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java @@ -4,10 +4,10 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ServiceSpec; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java index d1eefcae2..372cd34ce 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.UpdateSwarmCmd; import com.github.dockerjava.api.model.SwarmSpec; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Update a swarm. */ @@ -62,8 +62,7 @@ public SwarmSpec getSwarmSpec() { @Override public UpdateSwarmCmd withSwarmSpec(SwarmSpec swarmSpec) { - checkNotNull(swarmSpec, "swarmSpec was not specified"); - this.swarmSpec = swarmSpec; + this.swarmSpec = Objects.requireNonNull(swarmSpec, "swarmSpec was not specified"); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java index 278599641..a2f22fa14 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java @@ -4,10 +4,10 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.SwarmNodeSpec; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java index eeb05ff60..b627e2ccd 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java @@ -1,8 +1,11 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; + +import javax.annotation.Nullable; import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; /** @@ -15,6 +18,8 @@ public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd { private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java index aefff137d..fb2447c2d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java @@ -8,7 +8,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.github.dockerjava.api.exception.DockerClientException; import com.google.common.base.MoreObjects; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 78211bdec..ad7f285f4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -13,22 +13,20 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.io.IOException; +import java.util.Objects; import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19; -import static com.google.common.base.Preconditions.checkNotNull; public abstract class AbstrDockerCmdExec { - private final DockerClientConfig dockerClientConfig; + private final transient DockerClientConfig dockerClientConfig; - private final WebTarget baseResource; + private final transient WebTarget baseResource; public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - checkNotNull(baseResource, "baseResource was not specified"); - checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); - this.baseResource = baseResource; - this.dockerClientConfig = dockerClientConfig; + this.baseResource = Objects.requireNonNull(baseResource, "baseResource was not specified"); + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "dockerClientConfig was not specified"); } protected WebTarget getBaseResource() { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java index 1a8cd37e5..aa65fff40 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java @@ -15,7 +15,7 @@ import javax.annotation.CheckForNull; import static com.github.dockerjava.core.util.CacheFromEncoder.jsonEncode; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec implements BuildImageCmd.Exec { @@ -117,6 +117,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback webTarget = webTarget.queryParam("target", command.getTarget()); } + if (command.getExtraHosts() != null) { + webTarget = webTarget.queryParamsSet("extrahosts", command.getExtraHosts()); + } + LOGGER.trace("POST: {}", webTarget); InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java index ab9dbd24e..b67eb296a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java @@ -6,6 +6,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec implements ConnectToNetworkCmd.Exec { @@ -21,7 +23,11 @@ protected Void execute(ConnectToNetworkCmd command) { WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect"); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(command); + try { + webTarget.request().post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java index d1effbb3e..ea4a527b1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java @@ -28,7 +28,9 @@ protected Void execute(CopyArchiveToContainerCmd command) { InputStream streamToUpload = command.getTarInputStream(); webResource.queryParam("path", command.getRemotePath()) - .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request() + .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()) + .queryParam("copyUIDGID", command.isCopyUIDGID()) + .request() .put(streamToUpload, MediaType.APPLICATION_X_TAR); return null; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java new file mode 100644 index 000000000..4ead9cb48 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.CreateConfigCmd; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CreateConfigCmdExec extends AbstrSyncDockerCmdExec + implements CreateConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(CreateConfigCmdExec.class); + + public CreateConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected CreateConfigResponse execute(CreateConfigCmd command) { + WebTarget webResource = getBaseResource().path("/configs/create"); + + LOGGER.trace("POST: {} ", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON) + .post(command, new TypeReference() { + }); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java index d04233f2a..87d2cca81 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java @@ -27,6 +27,10 @@ protected CreateContainerResponse execute(CreateContainerCmd command) { webResource = webResource.queryParam("name", command.getName()); } + if (command.getPlatform() != null) { + webResource = webResource.queryParam("platform", command.getPlatform()); + } + LOGGER.trace("POST: {} ", webResource); return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()) .accept(MediaType.APPLICATION_JSON) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java index 401e51f76..6537aa930 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java @@ -4,6 +4,7 @@ import com.github.dockerjava.api.command.CreateServiceCmd; import com.github.dockerjava.api.command.CreateServiceResponse; import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.InvocationBuilder; import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; import org.slf4j.Logger; @@ -23,8 +24,11 @@ protected CreateServiceResponse execute(CreateServiceCmd command) { WebTarget webResource = getBaseResource().path("/services/create"); LOGGER.trace("POST: {} ", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getServiceSpec(), new TypeReference() { - }); + + InvocationBuilder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()) + .accept(MediaType.APPLICATION_JSON); + + return builder.post(command.getServiceSpec(), new TypeReference() { + }); } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java index dba6d75fd..abfb5df1a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java @@ -6,6 +6,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec implements DisconnectFromNetworkCmd.Exec { @@ -21,7 +23,11 @@ protected Void execute(DisconnectFromNetworkCmd command) { WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect"); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(command); + try { + webTarget.request().post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java new file mode 100644 index 000000000..9dab86f29 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.core.exec; + +import java.io.InputStream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.github.dockerjava.api.command.ExportContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; + +public class ExportContainerCmdExec extends AbstrSyncDockerCmdExec + implements ExportContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ExportContainerCmdExec.class); + + public ExportContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected InputStream execute(ExportContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/export").resolveTemplate("id", + command.getContainerId()); + + LOGGER.trace("GET: {}", webResource); + + return webResource.request().accept(MediaType.APPLICATION_X_TAR).get(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java new file mode 100644 index 000000000..8ba2a066d --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.core.exec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.ImageHistoryCmd; +import com.github.dockerjava.api.model.ImageHistory; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; + +public class ImageHistoryCmdExec extends AbstrSyncDockerCmdExec> implements + ImageHistoryCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ImageHistoryCmdExec.class); + + public ImageHistoryCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected List execute(ImageHistoryCmd command) { + WebTarget webResource = getBaseResource().path("/images/{id}/history").resolveTemplate("id", + command.getImageId()); + + LOGGER.trace("GET: {}", webResource); + + return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference>() { + }); + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java index 2ec197097..ad7df8fd2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec implements InitializeSwarmCmd.Exec { @@ -22,8 +24,11 @@ protected Void execute(InitializeSwarmCmd command) { WebTarget webResource = getBaseResource().path("/swarm/init"); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java new file mode 100644 index 000000000..b751c4655 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.model.Config; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class InspectConfigCmdExec extends AbstrSyncDockerCmdExec + implements InspectConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(InspectConfigCmdExec.class); + + public InspectConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Config execute(InspectConfigCmd command) { + WebTarget webResource = getBaseResource().path("/configs/{id}") + .resolveTemplate("id", command.getConfigId()); + + LOGGER.debug("GET: {}", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference() { }); + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java index 8f479675a..29070d1b6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec implements JoinSwarmCmd.Exec { @@ -22,8 +24,11 @@ protected Void execute(JoinSwarmCmd command) { WebTarget webResource = getBaseResource().path("/swarm/join"); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java index a8ea6c16c..c98b9f0f8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class KillContainerCmdExec extends AbstrSyncDockerCmdExec implements KillContainerCmd.Exec { @@ -27,7 +29,11 @@ protected Void execute(KillContainerCmd command) { } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java index 1cded4938..fee9cea7a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec implements LeaveSwarmCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class); @@ -22,8 +24,11 @@ protected Void execute(LeaveSwarmCmd command) { webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); LOGGER.trace("POST: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null); + try { + webTarget.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java new file mode 100644 index 000000000..89a1b83b1 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java @@ -0,0 +1,43 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.model.Config; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import com.github.dockerjava.core.util.FiltersEncoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +public class ListConfigsCmdExec extends AbstrSyncDockerCmdExec> implements ListConfigsCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ListConfigsCmdExec.class); + + public ListConfigsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected List execute(ListConfigsCmd command) { + WebTarget webTarget = getBaseResource().path("/configs"); + + if (command.getFilters() != null && !command.getFilters().isEmpty()) { + webTarget = webTarget + .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters())); + } + + LOGGER.trace("GET: {}", webTarget); + + List configs = webTarget.request().accept(MediaType.APPLICATION_JSON) + .get(new TypeReference>() { + }); + + LOGGER.trace("Response: {}", configs); + + return configs; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java new file mode 100644 index 000000000..47f1d52fc --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; +import com.github.dockerjava.api.model.LoadResponseItem; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LoadImageAsyncCmdExec extends AbstrAsyncDockerCmdExec implements LoadImageAsyncCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageAsyncCmdExec.class); + + public LoadImageAsyncCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute0(LoadImageAsyncCmd command, ResultCallback resultCallback) { + WebTarget webTarget = getBaseResource().path("/images/load"); + + LOGGER.trace("POST: {}", webTarget); + + webTarget.request().post(new TypeReference() { }, resultCallback, command.getImageStream()); + + return null; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java index 54168bb5e..357af6d0e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java @@ -32,6 +32,10 @@ protected Void execute0(LogContainerCmd command, ResultCallback resultCal webTarget = webTarget.queryParam("since", command.getSince()); } + if (command.getUntil() != null) { + webTarget = webTarget.queryParam("until", command.getUntil()); + } + webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled()); webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java index b86e33611..a24b45a9b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec implements PauseContainerCmd.Exec { @@ -23,7 +25,11 @@ protected Void execute(PauseContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java index 58ff3ad93..bbb078cf7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java @@ -7,6 +7,8 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class PingCmdExec extends AbstrSyncDockerCmdExec implements PingCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class); @@ -20,7 +22,11 @@ protected Void execute(PingCmd command) { WebTarget webResource = getBaseResource().path("/_ping"); LOGGER.trace("GET: {}", webResource); - webResource.request().get(); + try { + webResource.request().get().close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java index 0f3705089..4f4540891 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PushResponseItem; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.InvocationBuilder; @@ -22,17 +21,11 @@ public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC super(baseResource, dockerClientConfig); } - private String name(PushImageCmd command) { - String name = command.getName(); - AuthConfig authConfig = command.getAuthConfig(); - return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername(); - } - @Override protected Void execute0(PushImageCmd command, ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag", - command.getTag()); + WebTarget webResource = getBaseResource().path("/images/{imageName}/push") + .resolveTemplate("imageName", command.getName()) + .queryParam("tag", command.getTag()); LOGGER.trace("POST: {}", webResource); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java new file mode 100644 index 000000000..1b81ef644 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java @@ -0,0 +1,28 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RemoveConfigCmdExec extends AbstrSyncDockerCmdExec implements RemoveConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(RemoveConfigCmdExec.class); + + public RemoveConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(RemoveConfigCmd command) { + WebTarget webTarget = getBaseResource().path("/configs/" + command.getConfigId()); + + LOGGER.trace("DELETE: {}", webTarget); + webTarget.request().accept(MediaType.APPLICATION_JSON).delete(); + + return null; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java index 2f16bdfb7..fdb312f1f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class); @@ -22,7 +24,11 @@ protected Void execute(RenameContainerCmd command) { .queryParam("name", command.getName()); LOG.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java new file mode 100644 index 000000000..4913bde79 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java @@ -0,0 +1,36 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; + +public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec implements ResizeContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class); + + public ResizeContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(ResizeContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/resize") + .resolveTemplate("id", command.getContainerId()).queryParam("h", command.getHeight()) + .queryParam("w", command.getWidth()); + + LOGGER.trace("POST: {}", webResource); + + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + return null; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java new file mode 100644 index 000000000..e799a95d5 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java @@ -0,0 +1,37 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; + + +public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec implements ResizeExecCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ResizeExecCmdExec.class); + + public ResizeExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(ResizeExecCmd command) { + WebTarget webResource = getBaseResource().path("/exec/{id}/resize") + .resolveTemplate("id", command.getExecId()).queryParam("h", command.getHeight()).queryParam("w", command.getWidth()); + + LOGGER.trace("POST: {}", webResource); + + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + return null; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java index b87fbce22..42f2579e6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec implements RestartContainerCmd.Exec { @@ -22,12 +24,20 @@ protected Void execute(RestartContainerCmd command) { WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id", command.getContainerId()); + if (command.getSignal() != null) { + webResource = webResource.queryParam("signal", command.getSignal()); + } + if (command.getTimeout() != null) { webResource = webResource.queryParam("t", String.valueOf(command.getTimeout())); } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java new file mode 100644 index 000000000..a1bb47c05 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java @@ -0,0 +1,39 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import com.google.common.collect.ImmutableSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.util.List; + +public class SaveImagesCmdExec extends AbstrSyncDockerCmdExec implements SaveImagesCmd.Exec { + private static final Logger LOGGER = LoggerFactory.getLogger(SaveImagesCmdExec.class); + + public SaveImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected InputStream execute(SaveImagesCmd command) { + + final List images = command.getImages(); + if (images.isEmpty()) { + LOGGER.warn("No images specified for " + SaveImagesCmd.class.getName() + "."); + } + final ImmutableSet.Builder queryParamSet = ImmutableSet.builder(); + for (SaveImagesCmd.TaggedImage image : images) { + queryParamSet.add(image.asString()); + } + final WebTarget webResource = getBaseResource() + .path("/images/get") + .queryParamsSet("names", queryParamSet.build()); + + LOGGER.trace("GET: {}", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON).get(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java index 205128190..0e92c9f97 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java @@ -23,11 +23,15 @@ public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClie @Override protected List execute(SearchImagesCmd command) { - WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm()); + WebTarget webResource = getBaseResource().path("/images/search") + .queryParam("term", command.getTerm()); + + if (command.getLimit() != null) { + webResource = webResource.queryParam("limit", command.getLimit()); + } LOGGER.trace("GET: {}", webResource); return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference>() { }); } - } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java index c773f5a56..774a85c3d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class StartContainerCmdExec extends AbstrSyncDockerCmdExec implements StartContainerCmd.Exec { @@ -23,9 +25,14 @@ protected Void execute(StartContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request() - .accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request() + .accept(MediaType.APPLICATION_JSON) + .post(null) + .close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java index f939a8494..6668ace04 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java @@ -23,6 +23,10 @@ protected Void execute0(StatsCmd command, ResultCallback resultCallb WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id", command.getContainerId()); + if (Boolean.TRUE.equals(command.hasNoStream())) { + webTarget = webTarget.queryParam("stream", "0"); + } + LOGGER.trace("GET: {}", webTarget); webTarget.request().get(new TypeReference() { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java index 90f707b93..85b139e93 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class StopContainerCmdExec extends AbstrSyncDockerCmdExec implements StopContainerCmd.Exec { @@ -27,7 +29,11 @@ protected Void execute(StopContainerCmd command) { } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java index a99498b91..05ed13859 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java @@ -7,6 +7,8 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class TagImageCmdExec extends AbstrSyncDockerCmdExec implements TagImageCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class); @@ -23,7 +25,11 @@ protected Void execute(TagImageCmd command) { webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(null); + try { + webTarget.request().post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java index c6fff7044..f0ce0f71a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.exec; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java index 3f7a98bf3..af23d9cb4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec implements UnpauseContainerCmd.Exec { @@ -23,7 +25,11 @@ protected Void execute(UnpauseContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java index 26f65cea3..61eb8b271 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * Update service settings. */ @@ -25,8 +27,11 @@ protected Void execute(UpdateServiceCmd command) { .queryParam("version", command.getVersion()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getServiceSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getServiceSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java index f73af5cc6..59b912dce 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec implements UpdateSwarmCmd.Exec { @@ -25,8 +27,11 @@ protected Void execute(UpdateSwarmCmd command) { webResource = booleanQueryParam(webResource, "rotateWorkertoken", command.getRotateWorkerToken()); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getSwarmSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java index 331e93f79..b050ba2bd 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * Update swarmNode spec */ @@ -27,8 +29,11 @@ protected Void execute(UpdateSwarmNodeCmd command) { .queryParam("version", command.getVersion()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getSwarmNodeSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmNodeSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java index 57cc727fe..3d2b2fa8e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java @@ -1,5 +1,6 @@ package com.github.dockerjava.core.exec; +import com.github.dockerjava.api.model.WaitContainerCondition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +26,11 @@ protected Void execute0(WaitContainerCmd command, ResultCallback r WebTarget webTarget = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id", command.getContainerId()); + WaitContainerCondition condition = command.getCondition(); + if (condition != null) { + webTarget = webTarget.queryParam("condition", condition.getValue()); + } + LOGGER.trace("POST: {}", webTarget); webTarget.request().accept(MediaType.APPLICATION_JSON).post((Object) null, new TypeReference() { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java index 82563962a..7cb1a19d4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java @@ -89,11 +89,13 @@ public static List loadCertificates(final Reader reader) throws IOE JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter() .setProvider(BouncyCastleProvider.PROVIDER_NAME); - Object certObj = pemParser.readObject(); + Object certObj; - if (certObj instanceof X509CertificateHolder) { - X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj; - certificates.add(certificateConverter.getCertificate(certificateHolder)); + while ((certObj = pemParser.readObject()) != null) { + if (certObj instanceof X509CertificateHolder) { + X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj; + certificates.add(certificateConverter.getCertificate(certificateHolder)); + } } return certificates; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java index 4590abb13..eb7b90aca 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java @@ -54,7 +54,8 @@ private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZ outputStream = new GzipCompressorOutputStream(outputStream); } TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream); - tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU); + tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); + tarArchiveOutputStream.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX); return tarArchiveOutputStream; } @@ -98,7 +99,8 @@ public static File archiveTARFiles(File base, Iterable files, String archi tarFile.deleteOnExit(); try (TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(new BufferedOutputStream( new FileOutputStream(tarFile))))) { - tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU); + tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); + tos.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX); for (File file : files) { // relativize with method using Path otherwise method with File resolves the symlinks // and this is not want we want. If the file is a symlink, the relativized path should diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java index 73b369ca7..0d6c1d268 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java @@ -10,6 +10,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Representation of Docker filters. @@ -64,6 +66,16 @@ public List getContainer() { return getFilter("container"); } + /** + * Filter by event types + * + * @param eventTypes an array of event types + */ + public FiltersBuilder withEventTypes(String... eventTypes) { + withFilter("type", Stream.of(eventTypes).collect(Collectors.toList())); + return this; + } + /** * Filter by labels * diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml new file mode 100644 index 000000000..52cf66de2 --- /dev/null +++ b/docker-java-transport-httpclient5/pom.xml @@ -0,0 +1,72 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport-httpclient5 + jar + + docker-java-transport-httpclient5 + https://github.com/docker-java/docker-java + Java API Client for Docker + + + com.github.dockerjava.transport.httpclient5 + + + + + ${project.groupId} + docker-java-transport + ${project.version} + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.5.1 + + + + net.java.dev.jna + jna + 5.18.1 + + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.httpclient5.* + + + + + + diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java new file mode 100644 index 000000000..68e0eeddf --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -0,0 +1,58 @@ +package com.github.dockerjava.httpclient5; + +import com.github.dockerjava.transport.SSLConfig; + +import java.net.URI; +import java.time.Duration; +import java.util.Objects; + +public final class ApacheDockerHttpClient extends ApacheDockerHttpClientImpl { + + public static final class Builder { + + private URI dockerHost = null; + + private SSLConfig sslConfig = null; + + private int maxConnections = Integer.MAX_VALUE; + + private Duration connectionTimeout; + + private Duration responseTimeout; + + public Builder dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Builder sslConfig(SSLConfig value) { + this.sslConfig = value; + return this; + } + + public Builder maxConnections(int value) { + this.maxConnections = value; + return this; + } + + public Builder connectionTimeout(Duration connectionTimeout) { + this.connectionTimeout = connectionTimeout; + return this; + } + + public Builder responseTimeout(Duration responseTimeout) { + this.responseTimeout = responseTimeout; + return this; + } + + public ApacheDockerHttpClient build() { + Objects.requireNonNull(dockerHost, "dockerHost"); + return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); + } + } + + private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout, + Duration responseTimeout) { + super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java new file mode 100644 index 000000000..c97a2bc45 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -0,0 +1,262 @@ +package com.github.dockerjava.httpclient5; + +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.NamedPipeSocket; +import com.github.dockerjava.transport.SSLConfig; +import com.github.dockerjava.transport.UnixSocket; + +import org.apache.hc.client5.http.SystemDefaultDnsResolver; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.DefaultHttpClientConnectionOperator; +import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.io.HttpClientConnectionOperator; +import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy; +import org.apache.hc.client5.http.ssl.TlsSocketStrategy; +import org.apache.hc.core5.http.ClassicHttpResponse; +import org.apache.hc.core5.http.ConnectionClosedException; +import org.apache.hc.core5.http.ContentLengthStrategy; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; +import org.apache.hc.core5.http.io.SocketConfig; +import org.apache.hc.core5.http.io.entity.ByteArrayEntity; +import org.apache.hc.core5.http.io.entity.EmptyInputStream; +import org.apache.hc.core5.http.io.entity.InputStreamEntity; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.http.protocol.HttpCoreContext; +import org.apache.hc.core5.net.URIAuthority; +import org.apache.hc.core5.util.TimeValue; +import org.apache.hc.core5.util.Timeout; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.net.URI; +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +class ApacheDockerHttpClientImpl implements DockerHttpClient { + + private final CloseableHttpClient httpClient; + private final HttpHost host; + private final String pathPrefix; + + protected ApacheDockerHttpClientImpl( + URI dockerHost, + SSLConfig sslConfig, + int maxConnections, + Duration connectionTimeout, + Duration responseTimeout + ) { + SSLContext sslContext; + try { + sslContext = sslConfig != null ? sslConfig.getSSLContext() : null; + } catch (Exception e) { + throw new RuntimeException(e); + } + HttpClientConnectionOperator connectionOperator = createConnectionOperator(dockerHost, sslContext); + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + pathPrefix = ""; + host = new HttpHost(dockerHost.getScheme(), "localhost", 2375); + break; + case "tcp": + String rawPath = dockerHost.getRawPath(); + pathPrefix = rawPath.endsWith("/") + ? rawPath.substring(0, rawPath.length() - 1) + : rawPath; + host = new HttpHost( + sslContext != null ? "https" : "http", + dockerHost.getHost(), + dockerHost.getPort() + ); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); + } + + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( + connectionOperator, + null, + null, + null, + new ManagedHttpClientConnectionFactory( + null, + null, + null, + null, + message -> { + Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); + if (transferEncodingHeader != null) { + if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { + return ContentLengthStrategy.UNDEFINED; + } + } + return DefaultContentLengthStrategy.INSTANCE.determineLength(message); + }, + null + ) + ); + // See https://github.com/docker-java/docker-java/pull/1590#issuecomment-870581289 + connectionManager.setDefaultSocketConfig( + SocketConfig.copy(SocketConfig.DEFAULT) + .setSoTimeout(Timeout.ZERO_MILLISECONDS) + .build() + ); + connectionManager.setMaxTotal(maxConnections); + connectionManager.setDefaultMaxPerRoute(maxConnections); + connectionManager.setDefaultConnectionConfig(ConnectionConfig.custom() + .setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND) + .setConnectTimeout(connectionTimeout != null ? Timeout.of(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS) : null) + .build()); + + httpClient = HttpClients.custom() + .setRequestExecutor(new HijackingHttpRequestExecutor(null)) + .setConnectionManager(connectionManager) + .setDefaultRequestConfig(RequestConfig.custom() + .setResponseTimeout(responseTimeout != null ? Timeout.of(responseTimeout.toNanos(), TimeUnit.NANOSECONDS) : null) + .build()) + .disableConnectionState() + .build(); + } + + private HttpClientConnectionOperator createConnectionOperator( + URI dockerHost, + SSLContext sslContext + ) { + String dockerHostScheme = dockerHost.getScheme(); + String dockerHostPath = dockerHost.getPath(); + TlsSocketStrategy tlsSocketStrategy = sslContext != null ? + new DefaultClientTlsStrategy(sslContext) : DefaultClientTlsStrategy.createSystemDefault(); + return new DefaultHttpClientConnectionOperator( + socksProxy -> { + if ("unix".equalsIgnoreCase(dockerHostScheme)) { + return UnixSocket.get(dockerHostPath); + } else if ("npipe".equalsIgnoreCase(dockerHostScheme)) { + return new NamedPipeSocket(dockerHostPath); + } else { + return socksProxy == null ? new Socket() : new Socket(socksProxy); + } + }, + DefaultSchemePortResolver.INSTANCE, + SystemDefaultDnsResolver.INSTANCE, + name -> "https".equalsIgnoreCase(name) ? tlsSocketStrategy : null); + } + + @Override + public Response execute(Request request) { + HttpContext context = new HttpCoreContext(); + HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path())); + httpUriRequest.setScheme(host.getSchemeName()); + httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); + + request.headers().forEach(httpUriRequest::addHeader); + + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + httpUriRequest.setEntity(new ByteArrayEntity(bodyBytes, null)); + } else { + InputStream body = request.body(); + if (body != null) { + httpUriRequest.setEntity(new InputStreamEntity(body, null)); + } + } + + if (request.hijackedInput() != null) { + context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput()); + httpUriRequest.setHeader("Upgrade", "tcp"); + httpUriRequest.setHeader("Connection", "Upgrade"); + } + + try { + ClassicHttpResponse response = httpClient.executeOpen(host, httpUriRequest, context); + + return new ApacheResponse(httpUriRequest, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() throws IOException { + httpClient.close(); + } + + static class ApacheResponse implements Response { + + private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class); + + private final HttpUriRequestBase request; + + private final ClassicHttpResponse response; + + ApacheResponse(HttpUriRequestBase httpUriRequest, ClassicHttpResponse response) { + this.request = httpUriRequest; + this.response = response; + } + + @Override + public int getStatusCode() { + return response.getCode(); + } + + @Override + public Map> getHeaders() { + return Stream.of(response.getHeaders()).collect(Collectors.groupingBy( + NameValuePair::getName, + Collectors.mapping(NameValuePair::getValue, Collectors.toList()) + )); + } + + @Override + public String getHeader(String name) { + Header firstHeader = response.getFirstHeader(name); + return firstHeader != null ? firstHeader.getValue() : null; + } + + @Override + public InputStream getBody() { + try { + return response.getEntity() != null + ? response.getEntity().getContent() + : EmptyInputStream.INSTANCE; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() { + try { + request.abort(); + } catch (Exception e) { + LOGGER.debug("Failed to abort the request", e); + } + + try { + response.close(); + } catch (ConnectionClosedException e) { + LOGGER.trace("Failed to close the response", e); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); + } + } + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java new file mode 100644 index 000000000..df8fbd059 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java @@ -0,0 +1,146 @@ +package com.github.dockerjava.httpclient5; + +import org.apache.hc.core5.http.ClassicHttpRequest; +import org.apache.hc.core5.http.ClassicHttpResponse; +import org.apache.hc.core5.http.ConnectionReuseStrategy; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.ProtocolException; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.impl.io.HttpRequestExecutor; +import org.apache.hc.core5.http.io.HttpClientConnection; +import org.apache.hc.core5.http.io.HttpResponseInformationCallback; +import org.apache.hc.core5.http.io.entity.AbstractHttpEntity; +import org.apache.hc.core5.http.message.BasicClassicHttpRequest; +import org.apache.hc.core5.http.message.StatusLine; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.http.protocol.HttpCoreContext; +import org.apache.hc.core5.io.Closer; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Objects; + +class HijackingHttpRequestExecutor extends HttpRequestExecutor { + + static final String HIJACKED_INPUT_ATTRIBUTE = "com.github.docker-java.hijackedInput"; + + HijackingHttpRequestExecutor(ConnectionReuseStrategy connectionReuseStrategy) { + super(connectionReuseStrategy); + } + + @Override + public ClassicHttpResponse execute( + ClassicHttpRequest request, + HttpClientConnection conn, + HttpResponseInformationCallback informationCallback, + HttpContext context + ) throws IOException, HttpException { + Objects.requireNonNull(request, "HTTP request"); + Objects.requireNonNull(conn, "Client connection"); + Objects.requireNonNull(context, "HTTP context"); + + InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE); + if (hijackedInput != null) { + return executeHijacked(request, conn, (HttpCoreContext) context, hijackedInput); + } + + return super.execute(request, conn, informationCallback, context); + } + + private ClassicHttpResponse executeHijacked( + ClassicHttpRequest request, + HttpClientConnection conn, + HttpCoreContext context, + InputStream hijackedInput + ) throws HttpException, IOException { + try { + context.setSSLSession(conn.getSSLSession()); + context.setEndpointDetails(conn.getEndpointDetails()); + final ProtocolVersion transportVersion = request.getVersion(); + if (transportVersion != null) { + context.setProtocolVersion(transportVersion); + } + + conn.sendRequestHeader(request); + conn.sendRequestEntity(request); + conn.flush(); + + ClassicHttpResponse response = conn.receiveResponseHeader(); + if (response.getCode() != HttpStatus.SC_SWITCHING_PROTOCOLS) { + conn.terminateRequest(request); + throw new ProtocolException("Expected 101 Switching Protocols, got: " + new StatusLine(response)); + } + + Thread thread = new Thread(() -> { + try { + BasicClassicHttpRequest fakeRequest = new BasicClassicHttpRequest("POST", "/"); + fakeRequest.setHeader(HttpHeaders.CONTENT_LENGTH, Long.MAX_VALUE); + fakeRequest.setEntity(new HijackedEntity(hijackedInput)); + conn.sendRequestEntity(fakeRequest); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + thread.setName("docker-java-httpclient5-hijacking-stream-" + System.identityHashCode(request)); + thread.setDaemon(true); + thread.start(); + + // 101 -> 200 + response.setCode(200); + conn.receiveResponseEntity(response); + return response; + + } catch (final HttpException | IOException | RuntimeException ex) { + Closer.closeQuietly(conn); + throw ex; + } + } + + private static class HijackedEntity extends AbstractHttpEntity { + + private final InputStream inStream; + + HijackedEntity(InputStream inStream) { + super((String) null, null, false); + this.inStream = inStream; + } + + @Override + public void writeTo(OutputStream outStream) throws IOException { + byte[] buffer = new byte[1024]; + int read; + while ((read = inStream.read(buffer)) != -1) { + outStream.write(buffer, 0, read); + outStream.flush(); + } + } + + @Override + public InputStream getContent() { + return inStream; + } + + @Override + public boolean isStreaming() { + return true; + } + + @Override + public boolean isRepeatable() { + return false; + } + + @Override + public void close() throws IOException { + inStream.close(); + } + + @Override + public long getContentLength() { + return -1; + } + } +} diff --git a/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java new file mode 100644 index 000000000..d83621f78 --- /dev/null +++ b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java @@ -0,0 +1,16 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; + +import java.net.URI; + +public class HttpClient5Tests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new ApacheDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .build(); + } +} diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266..a600c208d 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,29 +4,28 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 0-SNAPSHOT ../pom.xml docker-java-transport-jersey - bundle + jar docker-java-transport-jersey https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.jersey + + - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs.version} - org.glassfish.jersey.connectors jersey-apache-connector @@ -35,7 +34,7 @@ org.apache.httpcomponents httpcore - 4.4.10 + 4.4.13 org.apache.httpcomponents @@ -68,10 +67,51 @@ junixsocket-native-common ${junixsocket.version} + + + org.slf4j + jcl-over-slf4j + 1.7.30 + test + + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + + com.github.dockerjava.jaxrs.ApacheUnixSocket + com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier + com.github.dockerjava.jaxrs.async.GETCallbackNotifier + com.github.dockerjava.jaxrs.async.GETCallbackNotifier + com.github.dockerjava.jaxrs.async.POSTCallbackNotifier + com.github.dockerjava.jaxrs.UnixConnectionSocketFactory + com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory#releaseConnection(long) + + + + SUPERCLASS_REMOVED + true + true + + + + + + org.apache.felix maven-bundle-plugin diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java deleted file mode 100644 index eac18ae8d..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.Closeable; -import java.io.IOException; - -import javax.ws.rs.client.WebTarget; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.AsyncDockerCmd; -import com.github.dockerjava.api.command.DockerCmdAsyncExec; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; - -public abstract class AbstrAsyncDockerCmdExec, A_RES_T> extends - AbstrDockerCmdExec implements DockerCmdAsyncExec { - - public AbstrAsyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - public Void exec(CMD_T command, ResultCallback resultCallback) { - return execute(command, resultCallback); - } - - protected final Void execute(final CMD_T command, final ResultCallback resultCallback) { - - ResultCallback delegatingResultCallback = new ResultCallback() { - - @Override - public void close() throws IOException { - resultCallback.close(); - command.close(); - } - - @Override - public void onStart(Closeable closeable) { - resultCallback.onStart(closeable); - } - - @Override - public void onNext(A_RES_T object) { - resultCallback.onNext(object); - } - - @Override - public void onError(Throwable throwable) { - resultCallback.onError(throwable); - } - - @Override - public void onComplete() { - resultCallback.onComplete(); - command.close(); - } - }; - - AbstractCallbackNotifier callbackNotifier = callbackNotifier(command, delegatingResultCallback); - - AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier); - - return null; - } - - protected abstract AbstractCallbackNotifier callbackNotifier(CMD_T command, - ResultCallback resultCallback); - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java deleted file mode 100644 index 3b93a8af2..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.RemoteApiVersion; -import com.google.common.io.BaseEncoding; - -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import java.io.IOException; - -import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION; -import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19; -import static com.google.common.base.Preconditions.checkNotNull; - -public abstract class AbstrDockerCmdExec { - - private final DockerClientConfig dockerClientConfig; - - private final WebTarget baseResource; - - protected final ObjectMapper objectMapper; - - public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - checkNotNull(baseResource, "baseResource was not specified"); - checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); - this.baseResource = baseResource; - this.dockerClientConfig = dockerClientConfig; - this.objectMapper = dockerClientConfig.getObjectMapper(); - checkNotNull(objectMapper, "objectMapper was not specified"); - } - - protected WebTarget getBaseResource() { - return baseResource; - } - - protected AuthConfigurations getBuildAuthConfigs() { - return dockerClientConfig.getAuthConfigurations(); - } - - protected String registryAuth(AuthConfig authConfig) { - try { - return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected Invocation.Builder resourceWithAuthConfig(AuthConfig authConfig, Invocation.Builder request) { - request = request.header("X-Registry-Auth", registryAuth(authConfig)); - return request; - } - - protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfig, Invocation.Builder request) { - if (authConfig != null) { - request = resourceWithAuthConfig(authConfig, request); - } - return request; - } - - protected String registryConfigs(AuthConfigurations authConfigs) { - try { - final String json; - final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion(); - - if (apiVersion.equals(UNKNOWN_VERSION)) { - ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries - final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{} - rootNode.setAll(authNodes); // merge 2 variants - json = rootNode.toString(); - } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) { - json = objectMapper.writeValueAsString(authConfigs.getConfigs()); - } else { - json = objectMapper.writeValueAsString(authConfigs); - } - - return BaseEncoding.base64Url().encode(json.getBytes()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected boolean bool(Boolean bool) { - return bool != null && bool; - } - - protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) { - if (bool(value)) { - webTarget = webTarget.queryParam(name, bool(value) + ""); - } - - return webTarget; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java deleted file mode 100644 index ed7d3adf0..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.WebTarget; - -import com.github.dockerjava.api.command.DockerCmd; -import com.github.dockerjava.api.command.DockerCmdSyncExec; -import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.core.DockerClientConfig; - -public abstract class AbstrSyncDockerCmdExec, RES_T> extends AbstrDockerCmdExec - implements DockerCmdSyncExec { - - public AbstrSyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - public RES_T exec(CMD_T command) { - // this hack works because of ResponseStatusExceptionFilter - try (CMD_T cmd = command) { - try { - return execute(cmd); - } catch (ProcessingException e) { - if (e.getCause() instanceof DockerException) { - throw (DockerException) e.getCause(); - } else { - throw e; - } - } - } - } - - protected abstract RES_T execute(CMD_T command); -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java index 50459de8c..72a851560 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java @@ -41,13 +41,13 @@ * * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket. */ -public class ApacheUnixSocket extends Socket { +class ApacheUnixSocket extends Socket { private final AFUNIXSocket inner; private final Queue optionsToSet = new ArrayDeque<>(); - public ApacheUnixSocket() throws IOException { + ApacheUnixSocket() throws IOException { this.inner = AFUNIXSocket.newInstance(); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java deleted file mode 100644 index 6131d48a1..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec implements - AttachContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class); - - public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(AttachContainerCmd command, - ResultCallback resultCallback) { - - if (command.getStdin() != null) { - throw new UnsupportedOperationException( - "Passing stdin to the container is currently not supported. Try experimental netty engine!"); - } - - WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id", - command.getContainerId()); - - webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled()); - webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); - webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); - webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled()); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java deleted file mode 100644 index 6812e397a..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.AuthCmd; -import com.github.dockerjava.api.exception.UnauthorizedException; -import com.github.dockerjava.api.model.AuthResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class AuthCmdExec extends AbstrSyncDockerCmdExec implements AuthCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class); - - public AuthCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AuthResponse execute(AuthCmd command) { - WebTarget webResource = getBaseResource().path("/auth"); - LOGGER.trace("POST: {}", webResource); - Response response = webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON)); - - if (response.getStatus() == 401) { - throw new UnauthorizedException("Unauthorized"); - } - - return response.readEntity(AuthResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java deleted file mode 100644 index 20dd5396d..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; -import static org.apache.commons.lang.StringUtils.isNotBlank; - -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import com.github.dockerjava.core.util.CacheFromEncoder; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.RequestEntityProcessing; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -import java.io.IOException; -import java.net.URLEncoder; -import java.util.Map; - -public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec implements - BuildImageCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class); - - public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) { - final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs()); - if (authConfigs != null && !authConfigs.getConfigs().isEmpty()) { - request = request.header("X-Registry-Config", registryConfigs(authConfigs)); - } - return request; - } - - private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand, - final AuthConfigurations fromConfig) { - if (fromCommand != null) { - return fromCommand; - } - if (fromConfig != null) { - return fromConfig; - } - return null; - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(BuildImageCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/build"); - String dockerFilePath = command.getPathToDockerfile(); - - if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) { - webTarget = webTarget.queryParam("dockerfile", dockerFilePath); - } - - if (command.getTags() != null && !command.getTags().isEmpty()) { - for (String t : command.getTags()) { - webTarget = webTarget.queryParam("t", t); - } - } else if (isNotBlank(command.getTag())) { - webTarget = webTarget.queryParam("t", command.getTag()); - } - - if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) { - webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom())); - } - - if (command.getRemote() != null) { - webTarget = webTarget.queryParam("remote", command.getRemote().toString()); - } - - webTarget = booleanQueryParam(webTarget, "q", command.isQuiet()); - webTarget = booleanQueryParam(webTarget, "nocache", command.hasNoCacheEnabled()); - webTarget = booleanQueryParam(webTarget, "pull", command.hasPullEnabled()); - webTarget = booleanQueryParam(webTarget, "rm", command.hasRemoveEnabled()); - webTarget = booleanQueryParam(webTarget, "forcerm", command.isForcerm()); - - // this has to be handled differently as it should switch to 'false' - if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) { - webTarget = webTarget.queryParam("rm", "false"); - } - - if (command.getMemory() != null) { - webTarget = webTarget.queryParam("memory", command.getMemory()); - } - if (command.getMemswap() != null) { - webTarget = webTarget.queryParam("memswap", command.getMemswap()); - } - if (command.getCpushares() != null) { - webTarget = webTarget.queryParam("cpushares", command.getCpushares()); - } - if (command.getCpusetcpus() != null) { - webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus()); - } - - if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) { - webTarget = webTarget.queryParam("rm", "false"); - } - - webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs()); - - if (command.getShmsize() != null) { - webTarget = webTarget.queryParam("shmsize", command.getShmsize()); - } - - webTarget = writeMap(webTarget, "labels", command.getLabels()); - - if (command.getNetworkMode() != null) { - webTarget = webTarget.queryParam("networkmode", command.getNetworkMode()); - } - - if (command.getPlatform() != null) { - webTarget = webTarget.queryParam("platform", command.getPlatform()); - } - - if (command.getTarget() != null) { - webTarget = webTarget.queryParam("target", command.getTarget()); - } - - webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED); - webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, BuildResponseItem.class), - resultCallback, - resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), - entity(command.getTarInputStream(), "application/tar") - ); - } - - private WebTarget writeMap(WebTarget webTarget, String name, Map value) { - if (value != null && !value.isEmpty()) { - try { - return webTarget.queryParam(name, - URLEncoder.encode(objectMapper.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20")); - } catch (IOException e) { - throw new RuntimeException(e); - } - } else { - return webTarget; - } - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java deleted file mode 100644 index f9ed0d5df..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class CommitCmdExec extends AbstrSyncDockerCmdExec implements CommitCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class); - - public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected String execute(CommitCmd command) { - WebTarget webTarget = getBaseResource().path("/commit") - .queryParam("container", command.getContainerId()) - .queryParam("repo", command.getRepository()) - .queryParam("tag", command.getTag()) - .queryParam("m", command.getMessage()) - .queryParam("author", command.getAuthor()); - - webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled()); - - LOGGER.trace("POST: {}", webTarget); - ObjectNode objectNode = webTarget.request().accept("application/vnd.docker.raw-stream") - .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class); - return objectNode.get("Id").asText(); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java deleted file mode 100644 index 8a69b31fd..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec - implements ConnectToNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class); - - public ConnectToNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(ConnectToNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command, MediaType.APPLICATION_JSON)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java deleted file mode 100644 index 29cbeebf7..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.model.ChangeLog; -import com.github.dockerjava.core.DockerClientConfig; - -public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec> implements - ContainerDiffCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class); - - public ContainerDiffCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ContainerDiffCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java deleted file mode 100644 index 7b6a6e2f4..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; - -public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec - implements CopyArchiveFromContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class); - - public CopyArchiveFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(CopyArchiveFromContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("Get: " + webResource.toString()); - - Response response = webResource.queryParam("path", command.getResource()).request().accept("application/x-tar") - .get(); - - return new WrappedResponseInputStream(response); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java deleted file mode 100644 index b38d337a8..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec implements - CopyArchiveToContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class); - - public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(CopyArchiveToContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("PUT: " + webResource.toString()); - InputStream streamToUpload = command.getTarInputStream(); - webResource.queryParam("path", command.getRemotePath()) - .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request() - .put(entity(streamToUpload, "application/x-tar")).close(); - return null; - - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java deleted file mode 100644 index 6afffe0c4..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; - -public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec - implements CopyFileFromContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class); - - public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(CopyFileFromContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: " + webResource.toString()); - - Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE) - .post(entity(command, MediaType.APPLICATION_JSON)); - - return new WrappedResponseInputStream(response); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java deleted file mode 100644 index 527b3954f..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec - implements CreateContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class); - - public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateContainerResponse execute(CreateContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/create"); - - if (command.getName() != null) { - webResource = webResource.queryParam("name", command.getName()); - } - - LOGGER.trace("POST: {} ", webResource); - return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java deleted file mode 100644 index dc1c9e1af..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateImageResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class CreateImageCmdExec extends AbstrSyncDockerCmdExec implements - CreateImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class); - - public CreateImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateImageResponse execute(CreateImageCmd command) { - WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository()) - .queryParam("tag", command.getTag()).queryParam("fromSrc", "-"); - - if (command.getPlatform() != null) { - webResource = webResource.queryParam("platform", command.getPlatform()); - } - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE) - .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java deleted file mode 100644 index 14f22b502..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateNetworkResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateNetworkCmdExec extends AbstrSyncDockerCmdExec implements - CreateNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateNetworkCmdExec.class); - - public CreateNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateNetworkResponse execute(CreateNetworkCmd command) { - WebTarget webResource = getBaseResource().path("/networks/create"); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateNetworkResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java deleted file mode 100644 index db85900de..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateSecretResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateSecretCmdExec extends AbstrSyncDockerCmdExec - implements CreateSecretCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateSecretCmdExec.class); - - public CreateSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateSecretResponse execute(CreateSecretCmd command) { - WebTarget webResource = getBaseResource().path("/secrets/create"); - - - LOGGER.trace("POST: {} ", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSecretSpec(), MediaType.APPLICATION_JSON), CreateSecretResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java deleted file mode 100644 index aa000e71a..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateServiceResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateServiceCmdExec extends AbstrSyncDockerCmdExec - implements CreateServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateServiceCmdExec.class); - - public CreateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateServiceResponse execute(CreateServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/create"); - - LOGGER.trace("POST: {} ", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON), CreateServiceResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java deleted file mode 100644 index c71d2297e..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.CreateVolumeResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec implements - CreateVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateVolumeCmdExec.class); - - public CreateVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateVolumeResponse execute(CreateVolumeCmd command) { - WebTarget webResource = getBaseResource().path("/volumes/create"); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateVolumeResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java deleted file mode 100644 index 95c3f5c22..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec - implements DisconnectFromNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class); - - public DisconnectFromNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(DisconnectFromNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command, MediaType.APPLICATION_JSON)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java deleted file mode 100644 index d6cb6aeed..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.model.Event; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.core.util.FiltersEncoder; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class EventsCmdExec extends AbstrAsyncDockerCmdExec implements EventsCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class); - - public EventsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(EventsCmd command, ResultCallback resultCallback) { - WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince()) - .queryParam("until", command.getUntil()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Event.class), resultCallback, - webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java deleted file mode 100644 index 4de6eedd2..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecCreateCmdResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec implements - ExecCreateCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class); - - public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected ExecCreateCmdResponse execute(ExecCreateCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java deleted file mode 100644 index 291cc2212..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec implements ExecStartCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class); - - public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(ExecStartCmd command, - ResultCallback resultCallback) { - WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId()); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept( - MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java deleted file mode 100644 index c544571ef..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.model.Info; -import com.github.dockerjava.core.DockerClientConfig; - -public class InfoCmdExec extends AbstrSyncDockerCmdExec implements InfoCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class); - - public InfoCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Info execute(InfoCmd command) { - WebTarget webResource = getBaseResource().path("/info"); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java deleted file mode 100644 index b3cdc83d4..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec - implements InitializeSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class); - - public InitializeSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(InitializeSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/init"); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java deleted file mode 100644 index 0599f04a1..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec - implements InspectContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class); - - public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectContainerResponse execute(InspectContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/json") - .resolveTemplate("id", command.getContainerId()); - - webResource = booleanQueryParam(webResource, "size", command.getSize()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java deleted file mode 100644 index 4290d0371..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectExecResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectExecCmdExec extends AbstrSyncDockerCmdExec implements - InspectExecCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class); - - public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectExecResponse execute(InspectExecCmd command) { - WebTarget webResource = getBaseResource().path("/exec/{id}/json").resolveTemplate("id", command.getExecId()); - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectExecResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java deleted file mode 100644 index c1ef42424..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectImageResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectImageCmdExec extends AbstrSyncDockerCmdExec implements - InspectImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class); - - public InspectImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectImageResponse execute(InspectImageCmd command) { - WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java deleted file mode 100644 index c9b19f881..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.model.Network; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectNetworkCmdExec extends AbstrSyncDockerCmdExec implements InspectNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class); - - public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Network execute(InspectNetworkCmd command) { - - WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id", - command.getNetworkId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Network.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java deleted file mode 100644 index 480103b43..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.model.Service; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectServiceCmdExec extends AbstrSyncDockerCmdExec - implements InspectServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectServiceCmdExec.class); - - public InspectServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Service execute(InspectServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/{id}") - .resolveTemplate("id", command.getServiceId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Service.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java deleted file mode 100644 index 87aa167c6..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.model.Swarm; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectSwarmCmdExec extends AbstrSyncDockerCmdExec - implements InspectSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmCmdExec.class); - - public InspectSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Swarm execute(InspectSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm"); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Swarm.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java deleted file mode 100644 index ff0075271..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.model.SwarmNode; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectSwarmNodeCmdExec extends AbstrSyncDockerCmdExec - implements InspectSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmNodeCmdExec.class); - - public InspectSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected SwarmNode execute(InspectSwarmNodeCmd command) { - WebTarget webResource = getBaseResource().path("/nodes/{id}") - .resolveTemplate("id", command.getSwarmNodeId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(SwarmNode.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java deleted file mode 100644 index 9ca2ac02a..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.InspectVolumeResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec implements - InspectVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectVolumeCmdExec.class); - - public InspectVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectVolumeResponse execute(InspectVolumeCmd command) { - WebTarget webResource = getBaseResource().path("/volumes/{name}").resolveTemplate("name", command.getName()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectVolumeResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 461899290..6298cae3b 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -1,738 +1,97 @@ package com.github.dockerjava.jaxrs; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.command.AuthCmd; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.command.WaitContainerCmd; -import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.core.DefaultDockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfigAware; -import com.github.dockerjava.core.SSLConfig; -import com.github.dockerjava.jaxrs.filter.JsonClientFilter; -import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; -import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.glassfish.jersey.CommonProperties; -import org.glassfish.jersey.apache.connector.ApacheClientProperties; -import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; -import org.glassfish.jersey.client.ClientConfig; -import org.glassfish.jersey.client.ClientProperties; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.transport.DockerHttpClient; import org.glassfish.jersey.client.RequestEntityProcessing; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.client.WebTarget; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.ProxySelector; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static com.google.common.base.Preconditions.checkNotNull; //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; // see https://github.com/docker-java/docker-java/issues/196 +/** + * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)} + */ +@Deprecated +public class JerseyDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { -public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { - - private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName()); - - private Client client; - - private WebTarget baseResource; - - private Integer readTimeout = null; - - private Integer connectTimeout = null; - - private Integer maxTotalConnections = null; - - private Integer maxPerRouteConnections = null; - - private Integer connectionRequestTimeout = null; - - private ClientRequestFilter[] clientRequestFilters = null; - - private ClientResponseFilter[] clientResponseFilters = null; - - private DockerClientConfig dockerClientConfig; - - private PoolingHttpClientConnectionManager connManager = null; - - private RequestEntityProcessing requestEntityProcessing; - - @Override - public void init(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; - - ClientConfig clientConfig = new ClientConfig(); - clientConfig.connectorProvider(new ApacheConnectorProvider()); - clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true); - - if (requestEntityProcessing != null) { - clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); - } - - clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper())); - clientConfig.register(JsonClientFilter.class); - RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); - - clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper())); - - // logging may disabled via log level - clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); - - if (readTimeout != null) { - requestConfigBuilder.setSocketTimeout(readTimeout); - clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); - } - - if (connectTimeout != null) { - requestConfigBuilder.setConnectTimeout(connectTimeout); - clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); - } - - if (clientResponseFilters != null) { - for (ClientResponseFilter clientResponseFilter : clientResponseFilters) { - if (clientResponseFilter != null) { - clientConfig.register(clientResponseFilter); - } - } - } - - if (clientRequestFilters != null) { - for (ClientRequestFilter clientRequestFilter : clientRequestFilters) { - if (clientRequestFilter != null) { - clientConfig.register(clientRequestFilter); - } - } - } - - URI originalUri = dockerClientConfig.getDockerHost(); - - String protocol = null; - - SSLContext sslContext = null; - - try { - final SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); - if (sslConfig != null) { - sslContext = sslConfig.getSSLContext(); - } - } catch (Exception ex) { - throw new DockerClientException("Error in SSL Configuration", ex); - } - - if (sslContext != null) { - protocol = "https"; - } else { - protocol = "http"; - } - - if (!originalUri.getScheme().equals("unix")) { - - try { - originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol)); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - - configureProxy(clientConfig, originalUri, protocol); - } - - connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry( - originalUri, sslContext)) { - - @Override - public void close() { - super.shutdown(); - } + private JerseyDockerHttpClient.Builder clientBuilder = new JerseyDockerHttpClient.Builder(); - @Override - public void shutdown() { - // Disable shutdown of the pool. This will be done later, when this factory is closed - // This is a workaround for finalize method on jerseys ClientRuntime which - // closes the client and shuts down the connection pool when it is garbage collected - } - }; + @Deprecated + protected Integer connectTimeout; - if (maxTotalConnections != null) { - connManager.setMaxTotal(maxTotalConnections); - } - if (maxPerRouteConnections != null) { - connManager.setDefaultMaxPerRoute(maxPerRouteConnections); - } + @Deprecated + protected Integer readTimeout; - clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager); - - // Configure connection pool timeout - if (connectionRequestTimeout != null) { - requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout); - } - clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build()); - ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig); - - if (sslContext != null) { - clientBuilder.sslContext(sslContext); - } - - client = clientBuilder.build(); - - baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart()); - } - - private URI sanitizeUrl(URI originalUri) { - if (originalUri.getScheme().equals("unix")) { - return UnixConnectionSocketFactory.sanitizeUri(originalUri); - } - return originalUri; - } - - private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) { - - List proxies = ProxySelector.getDefault().select(originalUri); - - for (Proxy proxy : proxies) { - InetSocketAddress address = (InetSocketAddress) proxy.address(); - if (address != null) { - String hostname = address.getHostName(); - int port = address.getPort(); - - clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port); - - String httpProxyUser = System.getProperty(protocol + ".proxyUser"); - if (httpProxyUser != null) { - clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser); - String httpProxyPassword = System.getProperty(protocol + ".proxyPassword"); - if (httpProxyPassword != null) { - clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword); - } - } - } - } - } - - private org.apache.http.config.Registry getSchemeRegistry(final URI originalUri, - SSLContext sslContext) { - RegistryBuilder registryBuilder = RegistryBuilder.create(); - registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory()); - if (sslContext != null) { - registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); - } - registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri)); - return registryBuilder.build(); - } - - protected WebTarget getBaseResource() { - checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); - return baseResource; - } - - protected DockerClientConfig getDockerClientConfig() { - checkNotNull(dockerClientConfig, - "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!"); - return dockerClientConfig; - } - - @Override - public AuthCmd.Exec createAuthCmdExec() { - return new AuthCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InfoCmd.Exec createInfoCmdExec() { - return new InfoCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PingCmd.Exec createPingCmdExec() { - return new PingCmdExec(getBaseResource(), getDockerClientConfig()); - } + private DefaultDockerCmdExecFactory dockerCmdExecFactory; @Override - public VersionCmd.Exec createVersionCmdExec() { - return new VersionCmdExec(getBaseResource(), getDockerClientConfig()); + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return dockerCmdExecFactory; } @Override - public PullImageCmd.Exec createPullImageCmdExec() { - return new PullImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PushImageCmd.Exec createPushImageCmdExec() { - return new PushImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public SaveImageCmd.Exec createSaveImageCmdExec() { - return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateImageCmd.Exec createCreateImageCmdExec() { - return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LoadImageCmd.Exec createLoadImageCmdExec() { - return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public SearchImagesCmd.Exec createSearchImagesCmdExec() { - return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveImageCmd.Exec createRemoveImageCmdExec() { - return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListImagesCmd.Exec createListImagesCmdExec() { - return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectImageCmd.Exec createInspectImageCmdExec() { - return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListContainersCmd.Exec createListContainersCmdExec() { - return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StartContainerCmd.Exec createStartContainerCmdExec() { - return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectContainerCmd.Exec createInspectContainerCmdExec() { - return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ExecCreateCmd.Exec createExecCmdExec() { - return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { - return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public WaitContainerCmd.Exec createWaitContainerCmdExec() { - return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public AttachContainerCmd.Exec createAttachContainerCmdExec() { - return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ExecStartCmd.Exec createExecStartCmdExec() { - return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectExecCmd.Exec createInspectExecCmdExec() { - return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LogContainerCmd.Exec createLogContainerCmdExec() { - return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { - return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { - return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { - return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StopContainerCmd.Exec createStopContainerCmdExec() { - return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ContainerDiffCmd.Exec createContainerDiffCmdExec() { - return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public KillContainerCmd.Exec createKillContainerCmdExec() { - return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { - return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RenameContainerCmd.Exec createRenameContainerCmdExec() { - return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RestartContainerCmd.Exec createRestartContainerCmdExec() { - return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CommitCmd.Exec createCommitCmdExec() { - return new CommitCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public BuildImageCmd.Exec createBuildImageCmdExec() { - return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public TopContainerCmd.Exec createTopContainerCmdExec() { - return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public TagImageCmd.Exec createTagImageCmdExec() { - return new TagImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PauseContainerCmd.Exec createPauseContainerCmdExec() { - return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { - return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public EventsCmd.Exec createEventsCmdExec() { - return new EventsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StatsCmd.Exec createStatsCmdExec() { - return new StatsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { - return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { - return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListVolumesCmd.Exec createListVolumesCmdExec() { - return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListNetworksCmd.Exec createListNetworksCmdExec() { - return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { - - return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - - return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { - - return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { - - return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { - - return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { - return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { - return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { - return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { - return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { - return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - // service - @Override - public ListServicesCmd.Exec createListServicesCmdExec() { - return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateServiceCmd.Exec createCreateServiceCmdExec() { - return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectServiceCmd.Exec createInspectServiceCmdExec() { - return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { - return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { - return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { - return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint); - } - - //node - @Override - public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { - return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { - return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { - return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { - return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListTasksCmd.Exec listTasksCmdExec() { - return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PruneCmd.Exec pruneCmdExec() { - return new PruneCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListSecretsCmd.Exec createListSecretsCmdExec() { - return new ListSecretsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateSecretCmd.Exec createCreateSecretCmdExec() { - return new CreateSecretCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { - return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig()); + public void init(DockerClientConfig dockerClientConfig) { + clientBuilder = clientBuilder + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()); + dockerCmdExecFactory = new DefaultDockerCmdExecFactory( + clientBuilder.build(), + dockerClientConfig.getObjectMapper() + ); + dockerCmdExecFactory.init(dockerClientConfig); } - @Override - public void close() throws IOException { - checkNotNull(client, "Factory not initialized. You probably forgot to call init()!"); - client.close(); - connManager.close(); + /** + * Configure connection timeout in milliseconds + */ + public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + clientBuilder = clientBuilder.connectTimeout(connectTimeout); + this.connectTimeout = connectTimeout; + return this; } + /** + * Configure read timeout in milliseconds + */ public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + clientBuilder = clientBuilder.readTimeout(readTimeout); this.readTimeout = readTimeout; return this; } - public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - this.connectTimeout = connectTimeout; - return this; - } - public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) { - this.maxTotalConnections = maxTotalConnections; + clientBuilder = clientBuilder.maxTotalConnections(maxTotalConnections); return this; } public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) { - this.maxPerRouteConnections = maxPerRouteConnections; + clientBuilder = clientBuilder.maxPerRouteConnections(maxPerRouteConnections); return this; } public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) { - this.connectionRequestTimeout = connectionRequestTimeout; + clientBuilder = clientBuilder.connectionRequestTimeout(connectionRequestTimeout); return this; } public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) { - this.clientResponseFilters = clientResponseFilter; + clientBuilder = clientBuilder.clientResponseFilters(clientResponseFilter); return this; } public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) { - this.clientRequestFilters = clientRequestFilters; + clientBuilder = clientBuilder.clientRequestFilters(clientRequestFilters); return this; } public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) { - this.requestEntityProcessing = requestEntityProcessing; + clientBuilder = clientBuilder.requestEntityProcessing(requestEntityProcessing); return this; } - - /** - * release connections from the pool - * - * @param idleSeconds idle seconds, longer than the configured value will be evicted - */ - public void releaseConnection(long idleSeconds) { - this.connManager.closeExpiredConnections(); - this.connManager.closeIdleConnections(idleSeconds, TimeUnit.SECONDS); - } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java new file mode 100644 index 000000000..78a65cf63 --- /dev/null +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -0,0 +1,396 @@ +package com.github.dockerjava.jaxrs; + +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.SSLConfig; +import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; +import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.config.Registry; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.impl.io.EmptyInputStream; +import org.glassfish.jersey.CommonProperties; +import org.glassfish.jersey.apache.connector.ApacheClientProperties; +import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; +import org.glassfish.jersey.client.ClientConfig; +import org.glassfish.jersey.client.ClientProperties; +import org.glassfish.jersey.client.RequestEntityProcessing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import javax.ws.rs.ProcessingException; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.MediaType; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * @deprecated use Apache HttpClient 5-based transport + */ +@Deprecated +public final class JerseyDockerHttpClient implements DockerHttpClient { + + public static final class Builder { + + private URI dockerHost = null; + + private SSLConfig sslConfig = null; + + private Integer readTimeout = null; + + private Integer connectTimeout = null; + + private Integer maxTotalConnections = Integer.MAX_VALUE; + + private Integer maxPerRouteConnections = Integer.MAX_VALUE; + + private Integer connectionRequestTimeout = null; + + private ClientRequestFilter[] clientRequestFilters = null; + + private ClientResponseFilter[] clientResponseFilters = null; + + private RequestEntityProcessing requestEntityProcessing; + + public Builder dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Builder sslConfig(SSLConfig value) { + this.sslConfig = value; + return this; + } + + public Builder readTimeout(Integer value) { + this.readTimeout = value; + return this; + } + + public Builder connectTimeout(Integer value) { + this.connectTimeout = value; + return this; + } + + public Builder maxTotalConnections(Integer value) { + this.maxTotalConnections = value; + return this; + } + + public Builder maxPerRouteConnections(Integer value) { + this.maxPerRouteConnections = value; + return this; + } + + public Builder connectionRequestTimeout(Integer value) { + this.connectionRequestTimeout = value; + return this; + } + + public Builder clientResponseFilters(ClientResponseFilter[] value) { + this.clientResponseFilters = value; + return this; + } + + public Builder clientRequestFilters(ClientRequestFilter[] value) { + this.clientRequestFilters = value; + return this; + } + + public Builder requestEntityProcessing(RequestEntityProcessing value) { + this.requestEntityProcessing = value; + return this; + } + + public JerseyDockerHttpClient build() { + return new JerseyDockerHttpClient( + dockerHost, + sslConfig, + maxTotalConnections, + maxPerRouteConnections, + connectionRequestTimeout, + readTimeout, + connectTimeout, + clientRequestFilters, + clientResponseFilters, + requestEntityProcessing + ); + } + } + + private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerHttpClient.class.getName()); + + private final Client client; + + private final PoolingHttpClientConnectionManager connManager; + + private final URI originalUri; + + private JerseyDockerHttpClient( + URI dockerHost, + SSLConfig sslConfig, + Integer maxTotalConnections, + Integer maxPerRouteConnections, + Integer connectionRequestTimeout, + Integer readTimeout, + Integer connectTimeout, + ClientRequestFilter[] clientRequestFilters, + ClientResponseFilter[] clientResponseFilters, + RequestEntityProcessing requestEntityProcessing + ) { + ClientConfig clientConfig = new ClientConfig(); + clientConfig.connectorProvider(new ApacheConnectorProvider()); + clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true); + + if (requestEntityProcessing != null) { + clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); + } + + clientConfig.register(new ResponseStatusExceptionFilter()); + // clientConfig.register(JsonClientFilter.class); + RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); + + // logging may disabled via log level + clientConfig.register(new SelectiveLoggingFilter(LOGGER, false)); + + if (readTimeout != null) { + requestConfigBuilder.setSocketTimeout(readTimeout); + clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); + } + + if (connectTimeout != null) { + requestConfigBuilder.setConnectTimeout(connectTimeout); + clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); + } + + if (clientResponseFilters != null) { + for (ClientResponseFilter clientResponseFilter : clientResponseFilters) { + if (clientResponseFilter != null) { + clientConfig.register(clientResponseFilter); + } + } + } + + if (clientRequestFilters != null) { + for (ClientRequestFilter clientRequestFilter : clientRequestFilters) { + if (clientRequestFilter != null) { + clientConfig.register(clientRequestFilter); + } + } + } + + SSLContext sslContext = null; + + try { + if (sslConfig != null) { + sslContext = sslConfig.getSSLContext(); + } + } catch (Exception ex) { + throw new DockerClientException("Error in SSL Configuration", ex); + } + + final String protocol = sslContext != null ? "https" : "http"; + + switch (dockerHost.getScheme()) { + case "unix": + break; + case "tcp": + try { + dockerHost = new URI(dockerHost.toString().replaceFirst("tcp", protocol)); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + + configureProxy(clientConfig, dockerHost, protocol); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); + } + + connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(dockerHost, sslContext)) { + + @Override + public void close() { + super.shutdown(); + } + + @Override + public void shutdown() { + // Disable shutdown of the pool. This will be done later, when this factory is closed + // This is a workaround for finalize method on jerseys ClientRuntime which + // closes the client and shuts down the connection pool when it is garbage collected + } + }; + + if (maxTotalConnections != null) { + connManager.setMaxTotal(maxTotalConnections); + } + if (maxPerRouteConnections != null) { + connManager.setDefaultMaxPerRoute(maxPerRouteConnections); + } + + clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager); + + // Configure connection pool timeout + if (connectionRequestTimeout != null) { + requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout); + } + clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build()); + ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig); + + if (sslContext != null) { + clientBuilder.sslContext(sslContext); + } + + client = clientBuilder.build(); + + this.originalUri = dockerHost; + } + + private URI sanitizeUrl(URI originalUri) { + if (originalUri.getScheme().equals("unix")) { + return UnixConnectionSocketFactory.sanitizeUri(originalUri); + } + return originalUri; + } + + private Registry getSchemeRegistry(URI originalUri, SSLContext sslContext) { + RegistryBuilder registryBuilder = RegistryBuilder.create(); + registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory()); + if (sslContext != null) { + registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); + } + registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri)); + return registryBuilder.build(); + } + + @Override + public Response execute(Request request) { + if (request.hijackedInput() != null) { + throw new UnsupportedOperationException("Does not support hijacking"); + } + String url = sanitizeUrl(originalUri).toString(); + if (url.endsWith("/") && request.path().startsWith("/")) { + url = url.substring(0, url.length() - 1); + } + + Invocation.Builder builder = client.target(url + request.path()).request(); + + request.headers().forEach(builder::header); + + try { + return new JerseyResponse( + builder.build(request.method(), toEntity(request)).invoke() + ); + } catch (ProcessingException e) { + if (e.getCause() instanceof DockerException) { + throw (DockerException) e.getCause(); + } + throw e; + } + } + + private Entity toEntity(Request request) { + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + return Entity.json(bodyBytes); + } + InputStream body = request.body(); + if (body != null) { + return Entity.entity(body, MediaType.APPLICATION_JSON_TYPE); + } + switch (request.method()) { + case "POST": + return Entity.json(null); + default: + return null; + } + } + + private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) { + List proxies = ProxySelector.getDefault().select(originalUri); + + for (Proxy proxy : proxies) { + InetSocketAddress address = (InetSocketAddress) proxy.address(); + if (address != null) { + String hostname = address.getHostName(); + int port = address.getPort(); + + clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port); + + String httpProxyUser = System.getProperty(protocol + ".proxyUser"); + if (httpProxyUser != null) { + clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser); + String httpProxyPassword = System.getProperty(protocol + ".proxyPassword"); + if (httpProxyPassword != null) { + clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword); + } + } + } + } + } + + @Override + public void close() { + if (client != null) { + client.close(); + } + + if (connManager != null) { + connManager.close(); + } + } + + private static class JerseyResponse implements Response { + + private final javax.ws.rs.core.Response response; + + JerseyResponse(javax.ws.rs.core.Response response) { + this.response = response; + } + + @Override + public int getStatusCode() { + return response.getStatus(); + } + + @Override + public Map> getHeaders() { + return response.getStringHeaders(); + } + + @Override + public InputStream getBody() { + return response.hasEntity() + ? response.readEntity(InputStream.class) + : EmptyInputStream.INSTANCE; + } + + @Override + public void close() { + try { + response.close(); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); + } + } + } +} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java deleted file mode 100644 index a19b7a18d..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec - implements JoinSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class); - - public JoinSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(JoinSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/join"); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java deleted file mode 100644 index 95c8ef83c..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class KillContainerCmdExec extends AbstrSyncDockerCmdExec implements - KillContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class); - - public KillContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(KillContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id", - command.getContainerId()); - - if (command.getSignal() != null) { - webResource = webResource.queryParam("signal", command.getSignal()); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java deleted file mode 100644 index 9723980a5..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec implements LeaveSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class); - - public LeaveSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(LeaveSwarmCmd command) { - WebTarget webTarget = getBaseResource().path("/swarm/leave"); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java deleted file mode 100644 index 50311ef54..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.model.Container; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListContainersCmdExec extends AbstrSyncDockerCmdExec> implements - ListContainersCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class); - - public ListContainersCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListContainersCmd command) { - WebTarget webTarget = getBaseResource().path("/containers/json").queryParam("since", command.getSinceId()) - .queryParam("before", command.getBeforeId()); - - webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled()); - webTarget = booleanQueryParam(webTarget, "size", command.hasShowSizeEnabled()); - - if (command.getLimit() != null && command.getLimit() >= 0) { - webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit())); - } - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List containers = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", containers); - - return containers; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java deleted file mode 100644 index 3d6320151..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.model.Image; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListImagesCmdExec extends AbstrSyncDockerCmdExec> implements ListImagesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class); - - public ListImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListImagesCmd command) { - WebTarget webTarget = getBaseResource().path("/images/json"); - - webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - if (command.getImageNameFilter() != null) { - webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); - } - - LOGGER.trace("GET: {}", webTarget); - - List images = webTarget.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - LOGGER.trace("Response: {}", images); - - return images; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java deleted file mode 100644 index 9137e28d2..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.model.Network; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec> implements - ListNetworksCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class); - - public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListNetworksCmd command) { - WebTarget webTarget = getBaseResource().path("/networks"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List networks = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", networks); - - return networks; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java deleted file mode 100644 index 8052dabfd..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.model.Secret; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListSecretsCmdExec extends AbstrSyncDockerCmdExec> implements - ListSecretsCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListSecretsCmdExec.class); - - public ListSecretsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListSecretsCmd command) { - WebTarget webTarget = getBaseResource().path("/secrets"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List secrets = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", secrets); - - return secrets; - } -} - diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java deleted file mode 100644 index df9f972e6..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.model.Service; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListServicesCmdExec extends AbstrSyncDockerCmdExec> implements - ListServicesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListServicesCmdExec.class); - - public ListServicesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListServicesCmd command) { - WebTarget webTarget = getBaseResource().path("/services"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List services = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", services); - - return services; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java deleted file mode 100644 index 763ff7899..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.model.SwarmNode; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec> implements - ListSwarmNodesCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListSwarmNodesCmdExec.class); - - public ListSwarmNodesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListSwarmNodesCmd command) { - WebTarget webTarget = getBaseResource().path("/nodes"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List nodes = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", nodes); - - return nodes; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java deleted file mode 100644 index 6a4b27d40..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.model.Task; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListTasksCmdExec extends AbstrSyncDockerCmdExec> implements - ListTasksCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListTasksCmdExec.class); - - public ListTasksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListTasksCmd command) { - WebTarget webTarget = getBaseResource().path("/tasks"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List tasks = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", tasks); - - return tasks; - } -} - diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java deleted file mode 100644 index 4f2165b93..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.ListVolumesResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec implements ListVolumesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListVolumesCmdExec.class); - - public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected ListVolumesResponse execute(ListVolumesCmd command) { - WebTarget webTarget = getBaseResource().path("/volumes"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - - return webTarget.request().accept(MediaType.APPLICATION_JSON).get(ListVolumesResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java deleted file mode 100644 index 23d6c493a..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class LoadImageCmdExec extends AbstrSyncDockerCmdExec implements LoadImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCmdExec.class); - - public LoadImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(LoadImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/load"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java deleted file mode 100644 index 19c2b24b0..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec implements - LogContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class); - - public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(LogContainerCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id", - command.getContainerId()); - - if (command.getTail() != null) { - webTarget = webTarget.queryParam("tail", command.getTail()); - } - - if (command.getSince() != null) { - webTarget = webTarget.queryParam("since", command.getSince()); - } - - webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled()); - webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); - webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); - webTarget = booleanQueryParam(webTarget, "follow", command.hasFollowStreamEnabled()); - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java deleted file mode 100644 index 2fb731005..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; - -public class LogSwarmObjectExec extends AbstrAsyncDockerCmdExec implements - LogSwarmObjectCmd.Exec { - - public LogSwarmObjectExec(WebTarget baseResource, DockerClientConfig dockerClientConfig, String endpoint) { - super(baseResource, dockerClientConfig); - this.endpoint = endpoint; - } - - private String endpoint = ""; - private static final Logger LOGGER = LoggerFactory.getLogger(LogSwarmObjectExec.class); - - @Override - protected AbstractCallbackNotifier callbackNotifier(LogSwarmObjectCmd command, ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/" + endpoint + "/{id}/logs").resolveTemplate("id", command.getId()); - - if (command.getTail() != null) { - webTarget = webTarget.queryParam("tail", command.getTail()); - } else { - webTarget = webTarget.queryParam("tail", "all"); - } - - if (command.getSince() != null) { - webTarget = webTarget.queryParam("since", command.getSince()); - } - - webTarget = booleanQueryParam(webTarget, "timestamps", command.getTimestamps()); - webTarget = booleanQueryParam(webTarget, "stdout", command.getStdout()); - webTarget = booleanQueryParam(webTarget, "stderr", command.getStderr()); - webTarget = booleanQueryParam(webTarget, "follow", command.getFollow()); - webTarget = booleanQueryParam(webTarget, "details", command.getDetails()); - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java deleted file mode 100644 index 5e6beb835..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec implements - PauseContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class); - - public PauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(PauseContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java deleted file mode 100644 index ef6215358..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class PingCmdExec extends AbstrSyncDockerCmdExec implements PingCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class); - - public PingCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(PingCmd command) { - WebTarget webResource = getBaseResource().path("/_ping"); - - LOGGER.trace("GET: {}", webResource); - webResource.request().get().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java deleted file mode 100644 index 324bc8201..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.model.PruneResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class PruneCmdExec extends AbstrSyncDockerCmdExec implements PruneCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PruneCmdExec.class); - - public PruneCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected PruneResponse execute(PruneCmd command) { - WebTarget webTarget = getBaseResource().path(command.getApiPath()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("POST: {}", webTarget); - - PruneResponse response = webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null, new GenericType() { }); - LOGGER.trace("Response: {}", response); - - return response; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java deleted file mode 100644 index c20691288..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.model.PullResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class PullImageCmdExec extends AbstrAsyncDockerCmdExec implements - PullImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class); - - public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(PullImageCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag()) - .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry()); - - if (command.getPlatform() != null) { - webResource = webResource.queryParam("platform", command.getPlatform()); - } - - LOGGER.trace("POST: {}", webResource); - Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept( - MediaType.APPLICATION_OCTET_STREAM_TYPE); - - return new POSTCallbackNotifier<>( - new JsonStreamProcessor<>(objectMapper, PullResponseItem.class), - resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java deleted file mode 100644 index 3f6d5434c..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.PushResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class PushImageCmdExec extends AbstrAsyncDockerCmdExec implements - PushImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class); - - public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - private String name(PushImageCmd command) { - String name = command.getName(); - AuthConfig authConfig = command.getAuthConfig(); - return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername(); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(PushImageCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag", - command.getTag()); - - LOGGER.trace("POST: {}", webResource); - - Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request()) - .accept(MediaType.APPLICATION_JSON); - - return new POSTCallbackNotifier<>( - new JsonStreamProcessor<>(objectMapper, PushResponseItem.class), - resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java deleted file mode 100644 index d649b57a5..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec implements - RemoveContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class); - - public RemoveContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveContainerCmd command) { - WebTarget webTarget = getBaseResource().path("/containers/" + command.getContainerId()); - - webTarget = booleanQueryParam(webTarget, "v", command.hasRemoveVolumesEnabled()); - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java deleted file mode 100644 index 9b362df72..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec implements RemoveImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class); - - public RemoveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java deleted file mode 100644 index acc2bdd27..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec - implements RemoveNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class); - - public RemoveNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java deleted file mode 100644 index 7e2bf4812..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveSecretCmdExec extends AbstrSyncDockerCmdExec implements - RemoveSecretCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSecretCmdExec.class); - - public RemoveSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveSecretCmd command) { - WebTarget webTarget = getBaseResource().path("/secrets/" + command.getSecretId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java deleted file mode 100644 index f10f94a3c..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveServiceCmdExec extends AbstrSyncDockerCmdExec implements - RemoveServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveServiceCmdExec.class); - - public RemoveServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveServiceCmd command) { - WebTarget webTarget = getBaseResource().path("/services/" + command.getServiceId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java deleted file mode 100644 index 6f71a468b..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec implements - RemoveSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExec.class); - - public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveSwarmNodeCmd command) { - WebTarget webTarget = getBaseResource().path("/nodes/" + command.getSwarmNodeId()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java deleted file mode 100644 index 618a85ed8..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec implements - RemoveVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveVolumeCmdExec.class); - - public RemoveVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveVolumeCmd command) { - WebTarget webTarget = getBaseResource().path("/volumes/" + command.getName()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java deleted file mode 100644 index c747ea9b0..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec - implements RenameContainerCmd.Exec { - private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class); - - public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RenameContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/rename") - .resolveTemplate("id", command.getContainerId()) - .queryParam("name", command.getName()); - - LOG.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java deleted file mode 100644 index 765537f44..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec implements - RestartContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class); - - public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RestartContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id", - command.getContainerId()); - - if (command.getTimeout() != null) { - webResource = webResource.queryParam("t", String.valueOf(command.getTimeout())); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java deleted file mode 100644 index c386ea3a0..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; -import com.google.common.base.Strings; - -public class SaveImageCmdExec extends AbstrSyncDockerCmdExec implements SaveImageCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class); - - public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(SaveImageCmd command) { - // If tag is present, only tar the specific image - // else tar all the images with the same name - String name = command.getName(); - if (!Strings.isNullOrEmpty(command.getTag())) { - name += ":" + command.getTag(); - } - WebTarget webResource = getBaseResource().path("/images/" + name + "/get"); - - LOGGER.trace("GET: {}", webResource); - Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get(); - - return new WrappedResponseInputStream(response); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java deleted file mode 100644 index 90fdd80cd..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.model.SearchItem; -import com.github.dockerjava.core.DockerClientConfig; - -public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec> implements - SearchImagesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class); - - public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(SearchImagesCmd command) { - WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java deleted file mode 100644 index 2851a26c7..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class StartContainerCmdExec extends AbstrSyncDockerCmdExec implements - StartContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class); - - public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(StartContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/start") - .resolveTemplate("id", command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request() - .accept(MediaType.APPLICATION_JSON) - .post(null) - .close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java deleted file mode 100644 index b1c69b656..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.model.Statistics; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class StatsCmdExec extends AbstrAsyncDockerCmdExec implements StatsCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class); - - public StatsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(StatsCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Statistics.class), - resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java deleted file mode 100644 index 930ccbb7d..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class StopContainerCmdExec extends AbstrSyncDockerCmdExec implements - StopContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class); - - public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(StopContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id", - command.getContainerId()); - - if (command.getTimeout() != null) { - webResource = webResource.queryParam("t", String.valueOf(command.getTimeout())); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java deleted file mode 100644 index aac15f9dd..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class TagImageCmdExec extends AbstrSyncDockerCmdExec implements TagImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class); - - public TagImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(TagImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId() + "/tag") - .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(null).close(); - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java deleted file mode 100644 index 22841d8bf..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.TopContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class TopContainerCmdExec extends AbstrSyncDockerCmdExec implements - TopContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class); - - public TopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected TopContainerResponse execute(TopContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id", - command.getContainerId()); - - if (!StringUtils.isEmpty(command.getPsArgs())) { - webResource = webResource.queryParam("ps_args", command.getPsArgs()); - } - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java index 0c5400ecd..84a72f077 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java @@ -40,11 +40,11 @@ * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets. */ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) -public class UnixConnectionSocketFactory implements ConnectionSocketFactory { +class UnixConnectionSocketFactory implements ConnectionSocketFactory { private File socketFile; - public UnixConnectionSocketFactory(final URI socketUri) { + UnixConnectionSocketFactory(final URI socketUri) { super(); final String filename = socketUri.toString().replaceAll("^unix:///", "unix://localhost/") diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java deleted file mode 100644 index 5c3828358..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec implements - UnpauseContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class); - - public UnpauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UnpauseContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java deleted file mode 100644 index 474d7338e..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.model.UpdateContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update container settings. - * - * @author Kanstantsin Shautsou - */ -public class UpdateContainerCmdExec extends AbstrSyncDockerCmdExec - implements UpdateContainerCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateContainerCmdExec.class); - - public UpdateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected UpdateContainerResponse execute(UpdateContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/update") - .resolveTemplate("id", command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), UpdateContainerResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java deleted file mode 100644 index d6259192b..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update service settings. - */ -public class UpdateServiceCmdExec extends AbstrSyncDockerCmdExec - implements UpdateServiceCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServiceCmdExec.class); - - public UpdateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/{id}/update") - .resolveTemplate("id", command.getServiceId()) - .queryParam("version", command.getVersion()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON)).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java deleted file mode 100644 index 833dd79ae..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec - implements UpdateSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmCmdExec.class); - - public UpdateSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/update") - .queryParam("version", command.getVersion()); - - webResource = booleanQueryParam(webResource, "rotateManagerToken", command.getRotateManagerToken()); - webResource = booleanQueryParam(webResource, "rotateWorkerToken", command.getRotateWorkerToken()); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSwarmSpec(), MediaType.APPLICATION_JSON)); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java deleted file mode 100644 index efb34f062..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update swarmNode spec - */ -public class UpdateSwarmNodeCmdExec extends AbstrSyncDockerCmdExec - implements UpdateSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmNodeCmdExec.class); - - public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateSwarmNodeCmd command) { - WebTarget webResource = getBaseResource().path("/nodes/{id}/update") - .resolveTemplate("id", command.getSwarmNodeId()) - .queryParam("version", command.getVersion()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSwarmNodeSpec(), MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java deleted file mode 100644 index 7fbc92784..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.model.Version; -import com.github.dockerjava.core.DockerClientConfig; - -public class VersionCmdExec extends AbstrSyncDockerCmdExec implements VersionCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class); - - public VersionCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Version execute(VersionCmd command) { - WebTarget webResource = getBaseResource().path("/version"); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Version.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java deleted file mode 100644 index 644bb8f22..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.WaitContainerCmd; -import com.github.dockerjava.api.model.WaitResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec implements - WaitContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class); - - public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(WaitContainerCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, WaitResponse.class), - resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, - MediaType.APPLICATION_JSON)); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java deleted file mode 100644 index cd7a7f809..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Created on 17.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.io.InputStream; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; -import com.google.common.util.concurrent.ThreadFactoryBuilder; - -public abstract class AbstractCallbackNotifier implements Callable { - - private final ResponseStreamProcessor responseStreamProcessor; - - private final ResultCallback resultCallback; - - private static final ThreadFactory FACTORY = - new ThreadFactoryBuilder().setDaemon(true).setNameFormat("dockerjava-jaxrs-async-%d").build(); - - protected final Builder requestBuilder; - - protected AbstractCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, - ResultCallback resultCallback, Builder requestBuilder) { - checkNotNull(requestBuilder, "An WebTarget must be provided"); - checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided"); - this.responseStreamProcessor = responseStreamProcessor; - this.resultCallback = resultCallback; - this.requestBuilder = requestBuilder; - } - - @Override - public Void call() throws Exception { - - Response response = null; - - try { - response = response(); - } catch (ProcessingException e) { - if (resultCallback != null) { - resultCallback.onError(e.getCause()); - } - return null; - } catch (Exception e) { - if (resultCallback != null) { - resultCallback.onError(e); - } - return null; - } - - try (InputStream inputStream = new WrappedResponseInputStream(response)) { - - if (resultCallback != null) { - responseStreamProcessor.processResponseStream(inputStream, resultCallback); - } - - return null; - } catch (Exception e) { - if (resultCallback != null) { - resultCallback.onError(e); - } - - return null; - } - } - - protected abstract Response response(); - - public static Future startAsyncProcessing(AbstractCallbackNotifier callbackNotifier) { - - ExecutorService executorService = Executors.newSingleThreadExecutor(FACTORY); - Future response = executorService.submit(callbackNotifier); - executorService.shutdown(); - return response; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java deleted file mode 100644 index e6f4fd1d2..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Created on 23.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; - -/** - * - * @author Marcus Linke - * - */ -public class GETCallbackNotifier extends AbstractCallbackNotifier { - - public GETCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, ResultCallback resultCallback, - Builder requestBuilder) { - super(responseStreamProcessor, resultCallback, requestBuilder); - } - - protected Response response() { - return requestBuilder.get(Response.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java deleted file mode 100644 index bd96e8250..000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Created on 23.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; - -/** - * - * @author Marcus Linke - * - */ -public class POSTCallbackNotifier extends AbstractCallbackNotifier { - - Entity entity = null; - - public POSTCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, ResultCallback resultCallback, - Builder requestBuilder, Entity entity) { - super(responseStreamProcessor, resultCallback, requestBuilder); - this.entity = entity; - } - - protected Response response() { - return requestBuilder.post(entity, Response.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java index 4a7765d97..64f5e88f8 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java @@ -17,6 +17,7 @@ * * This filter allows arbitrary redirection for other methods. */ +@Deprecated public class FollowRedirectsFilter implements ClientResponseFilter { @Override diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java index 2abc20618..a62034d27 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java @@ -12,6 +12,7 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ +@Deprecated public class JsonClientFilter implements ClientResponseFilter { @Override diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java index 9a0297fdb..986b4c10a 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java @@ -82,6 +82,7 @@ @PreMatching @Priority(Integer.MIN_VALUE) @SuppressWarnings("ClassWithMultipleLoggers") +@Deprecated public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter, ClientResponseFilter, WriterInterceptor { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index c0c6e3d48..8cc0a0746 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -1,22 +1,7 @@ package com.github.dockerjava.jaxrs.filter; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; - -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.MediaType; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; - import com.github.dockerjava.api.exception.BadRequestException; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; @@ -25,6 +10,17 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.UnauthorizedException; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientResponseContext; +import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.core.MediaType; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; /** * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s @@ -32,6 +28,7 @@ * @author Marcus Linke * */ +@Deprecated public class ResponseStatusExceptionFilter implements ClientResponseFilter { private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class); @@ -40,7 +37,7 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter { @Deprecated public ResponseStatusExceptionFilter() { - this(new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); + this(new ObjectMapper()); } public ResponseStatusExceptionFilter(ObjectMapper objectMapper) { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java index 9612011fa..862bdf0a9 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java @@ -16,6 +16,7 @@ * * @author sfitts */ +@Deprecated public class SelectiveLoggingFilter extends LoggingFilter { // Immutable'ish diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java index 4ec74ddcc..11e9f8684 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java @@ -11,6 +11,7 @@ * * @author Marcus Linke */ +@Deprecated public class WrappedResponseInputStream extends InputStream { private Response response; diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java new file mode 100644 index 000000000..64dfe3966 --- /dev/null +++ b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java @@ -0,0 +1,26 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; +import org.junit.Ignore; +import org.junit.Test; + +import java.net.URI; + +public class JerseyTests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new JerseyDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .connectTimeout(30 * 1000) + .build(); + } + + @Test + @Ignore("does not support hijacking") + @Override + public void testHijacking() throws Exception { + super.testHijacking(); + } +} diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167..42fdd34b7 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,22 +4,26 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 0-SNAPSHOT ../pom.xml docker-java-transport-netty - bundle + jar docker-java-transport-netty https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.netty + + - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index 3a5a1a32b..ed66a6db8 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -1,6 +1,6 @@ package com.github.dockerjava.netty; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.nonNull; import java.io.IOException; import java.net.InetAddress; @@ -8,6 +8,7 @@ import java.net.SocketAddress; import java.net.SocketTimeoutException; import java.security.Security; +import java.util.Objects; import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLEngine; @@ -15,7 +16,7 @@ import com.github.dockerjava.core.AbstractDockerCmdExecFactory; import com.github.dockerjava.core.WebTarget; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import com.github.dockerjava.api.command.DockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; @@ -58,7 +59,7 @@ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start */ -public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory implements DockerCmdExecFactory { +public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private static String threadPrefix = "dockerjava-netty"; @@ -88,10 +89,6 @@ public DuplexChannel getChannel() { } }; - private Integer connectTimeout = null; - - private Integer readTimeout = null; - @Override public void init(DockerClientConfig dockerClientConfig) { super.init(dockerClientConfig); @@ -101,13 +98,18 @@ public void init(DockerClientConfig dockerClientConfig) { String scheme = dockerClientConfig.getDockerHost().getScheme(); String host = ""; - if ("unix".equals(scheme)) { - nettyInitializer = new UnixDomainSocketInitializer(); - host = "DUMMY"; - } else if ("tcp".equals(scheme)) { - nettyInitializer = new InetSocketInitializer(); - host = dockerClientConfig.getDockerHost().getHost() + ":" - + Integer.toString(dockerClientConfig.getDockerHost().getPort()); + switch (scheme) { + case "unix": + nettyInitializer = new UnixDomainSocketInitializer(); + host = "DUMMY"; + break; + case "tcp": + nettyInitializer = new InetSocketInitializer(); + host = dockerClientConfig.getDockerHost().getHost() + ":" + + Integer.toString(dockerClientConfig.getDockerHost().getPort()); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerClientConfig.getDockerHost()); } eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig); @@ -282,34 +284,18 @@ public SSLParameters enableHostNameVerification(SSLParameters sslParameters) { @Override public void close() throws IOException { - checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!"); + Objects.requireNonNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!"); eventLoopGroup.shutdownGracefully(); } - /** - * Configure connection timeout in milliseconds - */ - public NettyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - this.connectTimeout = connectTimeout; - return this; - } - - /** - * Configure read timeout in milliseconds - */ - public NettyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { - this.readTimeout = readTimeout; - return this; - } - private T configure(T channel) { ChannelConfig channelConfig = channel.config(); - if (connectTimeout != null) { + if (nonNull(connectTimeout)) { channelConfig.setConnectTimeoutMillis(connectTimeout); } - if (readTimeout != null) { + if (nonNull(readTimeout)) { channel.pipeline().addLast("readTimeoutHandler", new ReadTimeoutHandler()); } @@ -345,7 +331,7 @@ protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEven } protected WebTarget getBaseResource() { - checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); + Objects.requireNonNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); return baseResource; } } diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java index 7478b83f6..ab13dc7b7 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java @@ -2,12 +2,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.InvocationBuilder; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.netty.handler.FramedResponseStreamHandler; @@ -86,14 +85,14 @@ public void onNext(Void object) { @Deprecated public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + DockerClientConfig.getDefaultObjectMapper(), channelProvider, resource ); } public NettyInvocationBuilder(ObjectMapper objectMapper, ChannelProvider channelProvider, String resource) { - this.objectMapper = objectMapper.copy().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + this.objectMapper = objectMapper; this.channelProvider = channelProvider; this.resource = resource; } @@ -112,17 +111,20 @@ public void delete() { HttpRequestProvider requestProvider = httpDeleteRequestProvider(); - ResponseCallback callback = new ResponseCallback<>(); + try (ResponseCallback callback = new ResponseCallback<>()) { - HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback); + HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback); - Channel channel = getChannel(); + Channel channel = getChannel(); - channel.pipeline().addLast(responseHandler); + channel.pipeline().addLast(responseHandler); - sendRequest(requestProvider, channel); + sendRequest(requestProvider, channel); - callback.awaitResult(); + callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void get(ResultCallback resultCallback) { @@ -142,12 +144,13 @@ public void get(ResultCallback resultCallback) { } public T get(TypeReference typeReference) { + try (ResponseCallback callback = new ResponseCallback<>()) { + get(typeReference, callback); - ResponseCallback callback = new ResponseCallback<>(); - - get(typeReference, callback); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void get(TypeReference typeReference, ResultCallback resultCallback) { @@ -268,12 +271,13 @@ public void run() { } public T post(final Object entity, TypeReference typeReference) { + try (ResponseCallback callback = new ResponseCallback<>()) { + post(entity, typeReference, callback); - ResponseCallback callback = new ResponseCallback<>(); - - post(entity, typeReference, callback); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void post(final Object entity, TypeReference typeReference, final ResultCallback resultCallback) { @@ -373,12 +377,13 @@ private void setDefaultHeaders(HttpRequest request) { } public T post(TypeReference typeReference, InputStream body) { + try (ResponseCallback callback = new ResponseCallback<>()) { + post(typeReference, callback, body); - ResponseCallback callback = new ResponseCallback<>(); - - post(typeReference, callback, body); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { @@ -465,28 +470,30 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType Channel channel = getChannel(); - ResponseCallback resultCallback = new ResponseCallback<>(); + try (ResponseCallback resultCallback = new ResponseCallback<>()) { + HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); - HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); + channel.pipeline().addLast(new ChunkedWriteHandler()); + channel.pipeline().addLast(responseHandler); - channel.pipeline().addLast(new ChunkedWriteHandler()); - channel.pipeline().addLast(responseHandler); - - HttpRequest request = requestProvider.getHttpRequest(resource); + HttpRequest request = requestProvider.getHttpRequest(resource); - // don't accept FullHttpRequest here - if (request instanceof FullHttpRequest) { - throw new DockerClientException("fatal: request is instance of FullHttpRequest"); - } + // don't accept FullHttpRequest here + if (request instanceof FullHttpRequest) { + throw new DockerClientException("fatal: request is instance of FullHttpRequest"); + } - request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED); - request.headers().remove(HttpHeaderNames.CONTENT_LENGTH); - request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType()); + request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED); + request.headers().remove(HttpHeaderNames.CONTENT_LENGTH); + request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType()); - channel.write(request); - channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024))); - channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); + channel.write(request); + channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024))); + channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); - resultCallback.awaitResult(); + resultCallback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } } diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java index e209cd231..8f2ffce27 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java @@ -12,12 +12,12 @@ import java.util.Objects; import java.util.Set; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; import com.google.common.collect.ImmutableSet; import io.netty.handler.codec.http.HttpConstants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -50,7 +50,7 @@ public class NettyWebTarget implements WebTarget { @Deprecated public NettyWebTarget(ChannelProvider channelProvider, String host) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + DockerClientConfig.getDefaultObjectMapper(), channelProvider, host, ImmutableList.of(), diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java index 963937061..b122c5090 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java @@ -1,12 +1,11 @@ package com.github.dockerjava.netty.handler; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.DockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Handler that encodes an outgoing object to JSON. * @@ -17,11 +16,7 @@ @Deprecated public class JsonRequestHandler extends MessageToByteEncoder { - private ObjectMapper mapper = new ObjectMapper(); - - public JsonRequestHandler() { - mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - } + private ObjectMapper mapper = DockerClientConfig.getDefaultObjectMapper(); @Override protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java index b46d062f9..f6e8af3c3 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java @@ -1,7 +1,6 @@ package com.github.dockerjava.netty.handler; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.github.dockerjava.core.DockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -26,9 +25,7 @@ public class JsonResponseCallbackHandler extends SimpleChannelInboundHandler< @Deprecated public JsonResponseCallbackHandler(TypeReference typeReference, ResultCallback callback) { this( - new ObjectMapper() - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS), + DockerClientConfig.getDefaultObjectMapper(), typeReference, callback ); diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml new file mode 100644 index 000000000..2a0ae4227 --- /dev/null +++ b/docker-java-transport-okhttp/pom.xml @@ -0,0 +1,82 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport-okhttp + jar + + docker-java-transport-okhttp + https://github.com/docker-java/docker-java + Java API Client for Docker + + + com.github.dockerjava.transport.okhttp + + + + + ${project.groupId} + docker-java-core + ${project.version} + + + + com.squareup.okhttp3 + okhttp + 3.14.9 + + + + net.java.dev.jna + jna + 5.18.1 + + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + + SUPERCLASS_REMOVED + true + true + + + + com.github.dockerjava.okhttp.UnixDomainSocket$SockAddr + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.okhttp.* + + + + + + diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java new file mode 100644 index 000000000..275d8290b --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java @@ -0,0 +1,61 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.transport.DockerHttpClient; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.internal.connection.Exchange; +import okhttp3.internal.http.RealInterceptorChain; +import okhttp3.internal.ws.RealWebSocket; +import okio.BufferedSink; + +import java.io.IOException; +import java.io.InputStream; + +class HijackingInterceptor implements Interceptor { + + @Override + public Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + Response response = chain.proceed(request); + if (!response.isSuccessful()) { + return response; + } + + DockerHttpClient.Request originalRequest = request.tag(DockerHttpClient.Request.class); + + if (originalRequest == null) { + // WTF? + return response; + } + + InputStream stdin = originalRequest.hijackedInput(); + + if (stdin == null) { + return response; + } + + chain.call().timeout().clearTimeout().clearDeadline(); + + Exchange exchange = ((RealInterceptorChain) chain).exchange(); + RealWebSocket.Streams streams = exchange.newWebSocketStreams(); + Thread thread = new Thread(() -> { + try (BufferedSink sink = streams.sink) { + while (sink.isOpen()) { + int aByte = stdin.read(); + if (aByte < 0) { + break; + } + sink.writeByte(aByte); + sink.emit(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + thread.setName("okhttp-hijack-streaming-" + System.identityHashCode(request)); + thread.setDaemon(true); + thread.start(); + return response; + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java new file mode 100644 index 000000000..066ae7ce8 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java @@ -0,0 +1,41 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.transport.NamedPipeSocket; + +import javax.net.SocketFactory; +import java.net.InetAddress; +import java.net.Socket; + +class NamedPipeSocketFactory extends SocketFactory { + + final String socketFileName; + + NamedPipeSocketFactory(String socketFileName) { + this.socketFileName = socketFileName; + } + + @Override + public Socket createSocket() { + return new NamedPipeSocket(socketFileName); + } + + @Override + public Socket createSocket(String s, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) { + throw new UnsupportedOperationException(); + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java new file mode 100644 index 000000000..ee58acb09 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -0,0 +1,314 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.SSLConfig; +import okhttp3.Call; +import okhttp3.ConnectionPool; +import okhttp3.Dns; +import okhttp3.HttpUrl; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.RequestBody; +import okhttp3.ResponseBody; +import okio.BufferedSink; +import okio.Okio; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.X509TrustManager; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.net.InetAddress; +import java.net.URI; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +public final class OkDockerHttpClient implements DockerHttpClient { + + private static final Logger LOGGER = LoggerFactory.getLogger(OkDockerHttpClient.class); + + public static final class Builder { + + private URI dockerHost = null; + + private SSLConfig sslConfig = null; + + private Integer readTimeout = null; + + private Integer connectTimeout = null; + + private Boolean retryOnConnectionFailure = null; + + public Builder dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Builder sslConfig(SSLConfig value) { + this.sslConfig = value; + return this; + } + + public Builder readTimeout(Integer value) { + this.readTimeout = value; + return this; + } + + public Builder connectTimeout(Integer value) { + this.connectTimeout = value; + return this; + } + + Builder retryOnConnectionFailure(Boolean value) { + this.retryOnConnectionFailure = value; + return this; + } + + public OkDockerHttpClient build() { + Objects.requireNonNull(dockerHost, "dockerHost"); + return new OkDockerHttpClient( + dockerHost, + sslConfig, + readTimeout, + connectTimeout, + retryOnConnectionFailure + ); + } + } + + private static final String SOCKET_SUFFIX = ".socket"; + + final OkHttpClient client; + + final OkHttpClient streamingClient; + + private final HttpUrl baseUrl; + + private OkDockerHttpClient( + URI dockerHost, + SSLConfig sslConfig, + Integer readTimeout, + Integer connectTimeout, + Boolean retryOnConnectionFailure + ) { + okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder() + .addNetworkInterceptor(new HijackingInterceptor()) + .readTimeout(0, TimeUnit.MILLISECONDS) + .retryOnConnectionFailure(true); + + if (readTimeout != null) { + clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); + } + + if (connectTimeout != null) { + clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); + } + + if (retryOnConnectionFailure != null) { + clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); + } + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + String socketPath = dockerHost.getPath(); + + if ("unix".equals(dockerHost.getScheme())) { + clientBuilder.socketFactory(new UnixSocketFactory(socketPath)); + } else { + clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath)); + } + + clientBuilder + .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS)) + .dns(hostname -> { + if (hostname.endsWith(SOCKET_SUFFIX)) { + return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0})); + } else { + return Dns.SYSTEM.lookup(hostname); + } + }); + break; + default: + } + + boolean isSSL = false; + if (sslConfig != null) { + try { + SSLContext sslContext = sslConfig.getSSLContext(); + if (sslContext != null) { + isSSL = true; + clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + client = clientBuilder.build(); + + streamingClient = client.newBuilder().build(); + + HttpUrl.Builder baseUrlBuilder; + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + baseUrlBuilder = new HttpUrl.Builder() + .scheme("http") + .host("docker" + SOCKET_SUFFIX); + break; + case "tcp": + baseUrlBuilder = new HttpUrl.Builder() + .scheme(isSSL ? "https" : "http") + .host(dockerHost.getHost()) + .port(dockerHost.getPort()); + + if (dockerHost.getPath().length() > 0) { + baseUrlBuilder = baseUrlBuilder.encodedPath(dockerHost.getPath()); + } + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); + } + baseUrl = baseUrlBuilder.build(); + } + + private RequestBody toRequestBody(Request request) { + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + return RequestBody.create(null, bodyBytes); + } + + InputStream body = request.body(); + if (body != null) { + return new RequestBody() { + @Override + public MediaType contentType() { + return null; + } + + @Override + public void writeTo(BufferedSink sink) throws IOException { + sink.writeAll(Okio.source(body)); + } + }; + } + switch (request.method()) { + case "POST": + return RequestBody.create(null, ""); + default: + return null; + } + } + + @Override + public Response execute(Request request) { + String url = baseUrl.toString(); + if (url.endsWith("/") && request.path().startsWith("/")) { + url = url.substring(0, url.length() - 1); + } + okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder() + .url(url + request.path()) + .tag(Request.class, request) + .method(request.method(), toRequestBody(request)); + + request.headers().forEach(requestBuilder::header); + + final OkHttpClient clientToUse; + + if (request.hijackedInput() == null) { + clientToUse = client; + } else { + clientToUse = streamingClient; + } + + Call call = clientToUse.newCall(requestBuilder.build()); + try { + return new OkResponse(call); + } catch (IOException e) { + call.cancel(); + throw new UncheckedIOException("Error while executing " + request, e); + } + } + + @Override + public void close() throws IOException { + for (OkHttpClient clientToClose : new OkHttpClient[]{client, streamingClient}) { + clientToClose.dispatcher().cancelAll(); + clientToClose.dispatcher().executorService().shutdown(); + clientToClose.connectionPool().evictAll(); + } + } + + static class OkResponse implements Response { + + static final ThreadLocal CLOSING = ThreadLocal.withInitial(() -> false); + + private final Call call; + + private final okhttp3.Response response; + + OkResponse(Call call) throws IOException { + this.call = call; + this.response = call.execute(); + } + + @Override + public int getStatusCode() { + return response.code(); + } + + @Override + public Map> getHeaders() { + return response.headers().toMultimap(); + } + + @Override + public InputStream getBody() { + ResponseBody body = response.body(); + if (body == null) { + return null; + } + + return body.source().inputStream(); + } + + @Override + public void close() { + boolean previous = CLOSING.get(); + CLOSING.set(true); + try { + call.cancel(); + response.close(); + } catch (Exception | AssertionError e) { + LOGGER.debug("Failed to close the response", e); + } finally { + CLOSING.set(previous); + } + } + } + + static class TrustAllX509TrustManager implements X509TrustManager { + @Override + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java new file mode 100644 index 000000000..a824e9954 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -0,0 +1,66 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.core.DefaultDockerCmdExecFactory; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerClientConfigAware; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.transport.DockerHttpClient; + +/** + * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)} + */ +@Deprecated +public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { + + private OkDockerHttpClient.Builder clientBuilder = new OkDockerHttpClient.Builder(); + + @Deprecated + protected Integer connectTimeout; + + @Deprecated + protected Integer readTimeout; + + private DefaultDockerCmdExecFactory dockerCmdExecFactory; + + /** + * Configure connection timeout in milliseconds + */ + public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + clientBuilder = clientBuilder.connectTimeout(connectTimeout); + this.connectTimeout = connectTimeout; + return this; + } + + /** + * Configure read timeout in milliseconds + */ + public OkHttpDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + clientBuilder = clientBuilder.readTimeout(readTimeout); + this.readTimeout = readTimeout; + return this; + } + + public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) { + this.clientBuilder = clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); + return this; + } + + @Override + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return dockerCmdExecFactory; + } + + @Override + public void init(DockerClientConfig dockerClientConfig) { + clientBuilder = clientBuilder + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()); + dockerCmdExecFactory = new DefaultDockerCmdExecFactory( + clientBuilder.build(), + dockerClientConfig.getObjectMapper() + ); + dockerCmdExecFactory.init(dockerClientConfig); + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java new file mode 100644 index 000000000..d25bcb3d3 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -0,0 +1,46 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.transport.UnixSocket; + +import javax.net.SocketFactory; +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; + +class UnixSocketFactory extends SocketFactory { + + private final String socketPath; + + UnixSocketFactory(String socketPath) { + this.socketPath = socketPath; + } + + @Override + public Socket createSocket() { + try { + return UnixSocket.get(socketPath); + } catch (IOException e) { + throw new RuntimeException("Failed create socket with path " + socketPath, e); + } + } + + @Override + public Socket createSocket(String s, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) { + throw new UnsupportedOperationException(); + } +} diff --git a/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java new file mode 100644 index 000000000..9a5b77ff3 --- /dev/null +++ b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java @@ -0,0 +1,17 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.okhttp.OkDockerHttpClient; + +import java.net.URI; + +public class OkHttpClientTests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new OkDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .connectTimeout(30 * 100) + .build(); + } +} diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml new file mode 100644 index 000000000..99ced1cb4 --- /dev/null +++ b/docker-java-transport-tck/pom.xml @@ -0,0 +1,70 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport-tck + jar + + docker-java-transport-tck + https://github.com/docker-java/docker-java + Java API Client for Docker + + + com.github.dockerjava.transport.tck + + + + + ${project.groupId} + docker-java-core + ${project.version} + + + ${project.groupId} + docker-java-transport + ${project.version} + + + + org.assertj + assertj-core + 3.27.7 + + + + com.squareup.okhttp3 + mockwebserver + 3.14.9 + + + + org.testcontainers + testcontainers + 2.0.5 + + + + org.slf4j + slf4j-jdk14 + 1.7.35 + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java new file mode 100644 index 000000000..f90973be6 --- /dev/null +++ b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java @@ -0,0 +1,148 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.transport.DockerHttpClient.Request; +import com.github.dockerjava.transport.DockerHttpClient.Request.Method; +import com.github.dockerjava.transport.DockerHttpClient.Response; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.junit.Test; +import org.testcontainers.DockerClientFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.dockerclient.TransportConfig; + +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.net.URI; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; + +public abstract class DockerHttpClientTCK { + + protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig); + + @Test + public void testHijacking() throws Exception { + try ( + DockerClient client = createDockerClient(); + + PipedOutputStream out = new PipedOutputStream(); + PipedInputStream in = new PipedInputStream(out); + + AttachContainerTestCallback callback = new AttachContainerTestCallback(); + + AttacheableContainer container = new AttacheableContainer() { + @Override + protected void containerIsCreated(String containerId) { + client.attachContainerCmd(containerId) + .withStdOut(true) + .withFollowStream(true) + .withStdIn(in) + .exec(callback); + } + }; + ) { + container.start(); + assertThat(callback.awaitStarted(5, SECONDS)).as("attached").isTrue(); + + String snippet = "hello world"; + out.write((snippet + "\n").getBytes()); + out.flush(); + + assertThat(callback.awaitCompletion(15, SECONDS)).as("completed").isTrue(); + assertThat(callback.toString()).contains("STDOUT: " + snippet); + } + } + + /** + * Test that docker-java supports path in DOCKER_HOST + * + * @see valid values + */ + @Test + public final void testPath() throws Exception { + try (MockWebServer server = new MockWebServer()) { + String dockerHost = server.url("/%20some/path/").toString() + .replace("http://", "tcp://"); + + try (DockerHttpClient client = createDockerHttpClient(dockerHost)) { + server.enqueue(new MockResponse().setResponseCode(200)); + ping(client); + assertThat(server.takeRequest().getPath()) + .as("recorded path") + .isEqualTo("/%20some/path/_ping"); + } + } + } + + private DockerHttpClient createDockerHttpClient() { + // Use Testcontainers to detect Docker environment + TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig(); + return createDockerHttpClient(transportConfig.getDockerHost(), transportConfig.getSslConfig()); + } + + private DockerHttpClient createDockerHttpClient(String dockerHost) { + return createDockerHttpClient(URI.create(dockerHost), null); + } + + private DockerClient createDockerClient() { + return createDockerClient(createDockerHttpClient()); + } + + private DockerClient createDockerClient(DockerHttpClient dockerHttpClient) { + return DockerClientImpl.getInstance( + DefaultDockerClientConfig.createDefaultConfigBuilder().build(), + dockerHttpClient + ); + } + + private void ping(DockerHttpClient client) { + Request pingRequest = Request.builder() + .method(Method.GET) + .path("/_ping") + .build(); + + try (Response response = client.execute(pingRequest)) { + assertThat(response.getStatusCode()) + .as("status code") + .isEqualTo(200); + } + } + + private static class AttachContainerTestCallback extends ResultCallback.Adapter { + + private final StringBuffer log = new StringBuffer(); + + @Override + public void onNext(Frame item) { + log.append(item.toString()); + super.onNext(item); + } + + @Override + public String toString() { + return log.toString(); + } + } + + private static class AttacheableContainer extends GenericContainer { + + private AttacheableContainer() { + super("busybox:1.35.0"); + + withCommand("/bin/sh", "-c", "read line && echo $line"); + withCreateContainerCmdModifier(it -> { + it.withTty(false); + it.withAttachStdin(true); + it.withAttachStdout(true); + it.withAttachStderr(true); + it.withStdinOpen(true); + }); + } + } +} diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml new file mode 100644 index 000000000..3cccafa33 --- /dev/null +++ b/docker-java-transport-zerodep/pom.xml @@ -0,0 +1,108 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport-zerodep + jar + + docker-java-transport-zerodep + https://github.com/docker-java/docker-java + Java API Client for Docker + + + com.github.dockerjava.transport.zerodep + + + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.zerodep.* + + + + + + org.apache.maven.plugins + maven-shade-plugin + + true + true + true + + + + com.github.docker-java:docker-java-transport + net.java.dev.jna:jna-platform + net.java.dev.jna:* + org.slf4j:slf4j-api + + + + + com.github.docker-java:docker-java-transport-httpclient5 + + com/github/dockerjava/httpclient5/ApacheDockerHttpClient.class + com/github/dockerjava/httpclient5/ApacheDockerHttpClient$* + + + + org.apache.httpcomponents.client5:httpclient5 + + mozilla/* + + + + + + org.apache + com.github.dockerjava.zerodep.shaded.org.apache + + + com.github.dockerjava.httpclient5 + com.github.dockerjava.zerodep + + + + + + + + + package + + shade + + + + + + + diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java new file mode 100644 index 000000000..fcacc6d1b --- /dev/null +++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java @@ -0,0 +1,58 @@ +package com.github.dockerjava.httpclient5; + +import java.net.URI; +import java.time.Duration; +import java.util.Objects; +import com.github.dockerjava.transport.SSLConfig; + +@SuppressWarnings("unused") +public final class ZerodepDockerHttpClient extends ApacheDockerHttpClientImpl { + + public static final class Builder { + + private URI dockerHost = null; + + private SSLConfig sslConfig = null; + + private int maxConnections = Integer.MAX_VALUE; + + private Duration connectionTimeout; + + private Duration responseTimeout; + + public Builder dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Builder sslConfig(SSLConfig value) { + this.sslConfig = value; + return this; + } + + public Builder maxConnections(int value) { + this.maxConnections = value; + return this; + } + + public Builder connectionTimeout(Duration connectionTimeout) { + this.connectionTimeout = connectionTimeout; + return this; + } + + public Builder responseTimeout(Duration responseTimeout) { + this.responseTimeout = responseTimeout; + return this; + } + + public ZerodepDockerHttpClient build() { + Objects.requireNonNull(dockerHost, "dockerHost"); + return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); + } + } + + private ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout, + Duration responseTimeout) { + super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); + } +} diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml new file mode 100644 index 000000000..8be456dd1 --- /dev/null +++ b/docker-java-transport/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport + jar + + docker-java-transport + https://github.com/docker-java/docker-java + Java API Client for Docker + + + com.github.dockerjava.transport + + + + + com.google.code.findbugs + annotations + 3.0.1u2 + provided + + + + org.immutables + value + 2.10.1 + provided + + + + net.java.dev.jna + jna + 5.18.1 + provided + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.transport.* + + + + + + diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java new file mode 100644 index 000000000..37a538bc9 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java @@ -0,0 +1,87 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketAddress; + +/** + * Abstract base class for custom socket implementation. + * + * @author Phillip Webb + */ +class AbstractSocket extends Socket { + + @Override + public void connect(SocketAddress endpoint) throws IOException { + } + + @Override + public void connect(SocketAddress endpoint, int timeout) throws IOException { + } + + @Override + public boolean isConnected() { + return true; + } + + @Override + public boolean isBound() { + return true; + } + + @Override + public void shutdownInput() throws IOException { + throw new UnsupportedSocketOperationException(); + } + + @Override + public void shutdownOutput() throws IOException { + throw new UnsupportedSocketOperationException(); + } + + @Override + public InetAddress getInetAddress() { + return null; + } + + @Override + public InetAddress getLocalAddress() { + return null; + } + + @Override + public SocketAddress getLocalSocketAddress() { + return null; + } + + @Override + public SocketAddress getRemoteSocketAddress() { + return null; + } + + private static class UnsupportedSocketOperationException extends UnsupportedOperationException { + + UnsupportedSocketOperationException() { + super("Unsupported socket operation"); + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java new file mode 100644 index 000000000..12d2004e6 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java @@ -0,0 +1,83 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +/** + * {@link DomainSocket} implementation for BSD based platforms. + * + * @author Phillip Webb + */ +class BsdDomainSocket extends DomainSocket { + + private static final int MAX_PATH_LENGTH = 104; + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + BsdDomainSocket(String path) throws IOException { + super(path); + } + + @Override + protected void connect(String path, int handle) { + SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8)); + connect(handle, address, address.size()); + } + + private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException; + + /** + * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}. + */ + public static class SockaddrUn extends Structure implements Structure.ByReference { + + public byte sunLen; + + public byte sunFamily; + + public byte[] sunPath = new byte[MAX_PATH_LENGTH]; + + private SockaddrUn(byte sunFamily, byte[] path) { + if (path.length > MAX_PATH_LENGTH) { + throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes"); + } + System.arraycopy(path, 0, this.sunPath, 0, path.length); + this.sunPath[path.length] = 0; + this.sunLen = (byte) (fieldOffset("sunPath") + path.length); + this.sunFamily = sunFamily; + allocateMemory(); + } + + @Override + protected List getFieldOrder() { + return Arrays.asList("sunLen", "sunFamily", "sunPath"); + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java new file mode 100644 index 000000000..7b780cb06 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java @@ -0,0 +1,90 @@ +package com.github.dockerjava.transport; + +import org.immutables.value.Value; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.ByteArrayInputStream; +import java.io.Closeable; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +public interface DockerHttpClient extends Closeable { + + Response execute(Request request); + + interface Response extends Closeable { + + int getStatusCode(); + + Map> getHeaders(); + + InputStream getBody(); + + @Override + void close(); + + @Nullable + default String getHeader(@Nonnull String name) { + for (Map.Entry> entry : getHeaders().entrySet()) { + if (name.equalsIgnoreCase(entry.getKey())) { + List values = entry.getValue(); + return values.isEmpty() ? null : values.get(0); + } + } + + return null; + } + } + + @Value.Immutable + @Value.Style( + visibility = Value.Style.ImplementationVisibility.PACKAGE, + overshadowImplementation = true, + depluralize = true + ) + abstract class Request { + + public enum Method { + GET, + POST, + PUT, + DELETE, + OPTIONS, + PATCH, + } + + public static class Builder extends ImmutableRequest.Builder { + + public Builder method(Method method) { + return method(method.name()); + } + } + + public static Builder builder() { + return new Builder(); + } + + public abstract String method(); + + public abstract String path(); + + @Nullable + @Value.Default + public InputStream body() { + byte[] bodyBytes = bodyBytes(); + return bodyBytes != null + ? new ByteArrayInputStream(bodyBytes) + : null; + } + + @Nullable + public abstract byte[] bodyBytes(); + + @Nullable + public abstract InputStream hijackedInput(); + + public abstract Map headers(); + } +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java new file mode 100644 index 000000000..a2a3503f5 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java @@ -0,0 +1,191 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.nio.ByteBuffer; + +import com.github.dockerjava.transport.FileDescriptor.Handle; +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; + +/** + * A {@link Socket} implementation for Linux of BSD domain sockets. + * + * @author Phillip Webb + */ +public abstract class DomainSocket extends AbstractSocket { + + private static final int SHUT_RD = 0; + + private static final int SHUT_WR = 1; + + protected static final int PF_LOCAL = 1; + + protected static final byte AF_LOCAL = 1; + + protected static final int SOCK_STREAM = 1; + + private final FileDescriptor fileDescriptor; + + private final InputStream inputStream; + + private final OutputStream outputStream; + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + DomainSocket(String path) throws IOException { + try { + this.fileDescriptor = open(path); + this.inputStream = new DomainSocketInputStream(); + this.outputStream = new DomainSocketOutputStream(); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + + private FileDescriptor open(String path) { + int handle = socket(PF_LOCAL, SOCK_STREAM, 0); + connect(path, handle); + return new FileDescriptor(handle, this::close); + } + + private int read(ByteBuffer buffer) throws IOException { + try (Handle handle = this.fileDescriptor.acquire()) { + if (handle.isClosed()) { + return -1; + } + try { + return read(handle.intValue(), buffer, buffer.remaining()); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + } + + public void write(ByteBuffer buffer) throws IOException { + try (Handle handle = this.fileDescriptor.acquire()) { + if (!handle.isClosed()) { + try { + write(handle.intValue(), buffer, buffer.remaining()); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + } + } + + @Override + public InputStream getInputStream() { + return this.inputStream; + } + + @Override + public OutputStream getOutputStream() { + return this.outputStream; + } + + @Override + public void close() throws IOException { + super.close(); + try { + this.fileDescriptor.close(); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + + protected abstract void connect(String path, int handle); + + private native int socket(int domain, int type, int protocol) throws LastErrorException; + + private native int read(int fd, ByteBuffer buffer, int count) throws LastErrorException; + + private native int write(int fd, ByteBuffer buffer, int count) throws LastErrorException; + + private native int close(int fd) throws LastErrorException; + + /** + * Return a new {@link DomainSocket} for the given path. + * @param path the path to the domain socket + * @return a {@link DomainSocket} instance + * @throws IOException if the socket cannot be opened + * @deprecated use {@link UnixSocket#get(String)} + */ + @Deprecated + public static DomainSocket get(String path) throws IOException { + if (Platform.isMac() || isBsdPlatform()) { + return new BsdDomainSocket(path); + } + return new LinuxDomainSocket(path); + } + + private static boolean isBsdPlatform() { + return Platform.isFreeBSD() || Platform.iskFreeBSD() || Platform.isNetBSD() || Platform.isOpenBSD(); + } + + /** + * {@link InputStream} returned from the {@link DomainSocket}. + */ + private class DomainSocketInputStream extends InputStream { + + @Override + public int read() throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(1); + int amountRead = DomainSocket.this.read(buffer); + return (amountRead != 1) ? -1 : buffer.get() & 0xFF; + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + if (len == 0) { + return 0; + } + int amountRead = DomainSocket.this.read(ByteBuffer.wrap(b, off, len)); + return (amountRead > 0) ? amountRead : -1; + } + + } + + /** + * {@link OutputStream} returned from the {@link DomainSocket}. + */ + private class DomainSocketOutputStream extends OutputStream { + + @Override + public void write(int b) throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(1); + buffer.put(0, (byte) (b & 0xFF)); + DomainSocket.this.write(buffer); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + if (len != 0) { + DomainSocket.this.write(ByteBuffer.wrap(b, off, len)); + } + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java new file mode 100644 index 000000000..31960f949 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java @@ -0,0 +1,121 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.Closeable; +import java.io.IOException; +import java.util.function.IntConsumer; + +/** + * Provides access to the underlying file system representation of an open file. + * + * @author Phillip Webb + * @see #acquire() + */ +class FileDescriptor { + + private final Handle openHandle; + + private final Handle closedHandler; + + private final IntConsumer closer; + + private Status status = Status.OPEN; + + private int referenceCount; + + FileDescriptor(int handle, IntConsumer closer) { + this.openHandle = new Handle(handle); + this.closedHandler = new Handle(-1); + this.closer = closer; + } + + @Override + protected void finalize() throws Throwable { + close(); + } + + /** + * Acquire an instance of the actual {@link Handle}. The caller must + * {@link Handle#close() close} the resulting handle when done. + * @return the handle + */ + synchronized Handle acquire() { + this.referenceCount++; + return (this.status != Status.OPEN) ? this.closedHandler : this.openHandle; + } + + private synchronized void release() { + this.referenceCount--; + if (this.referenceCount == 0 && this.status == Status.CLOSE_PENDING) { + this.closer.accept(this.openHandle.value); + this.status = Status.CLOSED; + } + } + + /** + * Close the underlying file when all handles have been released. + */ + synchronized void close() { + if (this.status == Status.OPEN) { + if (this.referenceCount == 0) { + this.closer.accept(this.openHandle.value); + this.status = Status.CLOSED; + } else { + this.status = Status.CLOSE_PENDING; + } + } + } + + /** + * The status of the file descriptor. + */ + private enum Status { + + OPEN, CLOSE_PENDING, CLOSED + + } + + /** + * Provides access to the actual file descriptor handle. + */ + final class Handle implements Closeable { + + private final int value; + + private Handle(int value) { + this.value = value; + } + + boolean isClosed() { + return this.value == -1; + } + + int intValue() { + return this.value; + } + + @Override + public void close() throws IOException { + if (!isClosed()) { + release(); + } + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java new file mode 100644 index 000000000..e1467858a --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java @@ -0,0 +1,80 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +/** + * {@link DomainSocket} implementation for Linux based platforms. + * + * @author Phillip Webb + */ +class LinuxDomainSocket extends DomainSocket { + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + LinuxDomainSocket(String path) throws IOException { + super(path); + } + + private static final int MAX_PATH_LENGTH = 108; + + @Override + protected void connect(String path, int handle) { + SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8)); + connect(handle, address, address.size()); + } + + private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException; + + /** + * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}. + */ + public static class SockaddrUn extends Structure implements Structure.ByReference { + + public short sunFamily; + + public byte[] sunPath = new byte[MAX_PATH_LENGTH]; + + private SockaddrUn(byte sunFamily, byte[] path) { + if (path.length > MAX_PATH_LENGTH) { + throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes"); + } + System.arraycopy(path, 0, this.sunPath, 0, path.length); + this.sunPath[path.length] = 0; + this.sunFamily = sunFamily; + allocateMemory(); + } + + @Override + protected List getFieldOrder() { + return Arrays.asList("sunFamily", "sunPath"); + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java new file mode 100644 index 000000000..e4aa315eb --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java @@ -0,0 +1,158 @@ +package com.github.dockerjava.transport; + +import com.sun.jna.Native; +import com.sun.jna.win32.StdCallLibrary; +import com.sun.jna.win32.W32APIOptions; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousByteChannel; +import java.nio.channels.AsynchronousCloseException; +import java.nio.channels.AsynchronousFileChannel; +import java.nio.channels.Channels; +import java.nio.channels.CompletionHandler; +import java.nio.file.FileSystemException; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Future; + +public class NamedPipeSocket extends Socket { + + private final String socketFileName; + + private AsynchronousFileByteChannel channel; + + public NamedPipeSocket(String socketFileName) { + this.socketFileName = socketFileName; + } + + @Override + public void close() throws IOException { + if (channel != null) { + channel.close(); + } + } + + @Override + public void connect(SocketAddress endpoint) throws IOException { + connect(endpoint, 0); + } + + @Override + public void connect(SocketAddress endpoint, int timeout) throws IOException { + long startedAt = System.currentTimeMillis(); + timeout = Math.max(timeout, 10_000); + while (true) { + try { + channel = new AsynchronousFileByteChannel( + AsynchronousFileChannel.open( + Paths.get(socketFileName), + StandardOpenOption.READ, + StandardOpenOption.WRITE + ) + ); + break; + } catch (FileSystemException e) { + if (System.currentTimeMillis() - startedAt >= timeout) { + throw new RuntimeException(e); + } else { + Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); + } + } + } + } + + @Override + public InputStream getInputStream() { + return Channels.newInputStream(channel); + } + + @Override + public OutputStream getOutputStream() { + return Channels.newOutputStream(channel); + } + + interface Kernel32 extends StdCallLibrary { + + Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS); + + @SuppressWarnings("checkstyle:methodname") + boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut); + } + + private static class AsynchronousFileByteChannel implements AsynchronousByteChannel { + private final AsynchronousFileChannel fileChannel; + + AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) { + this.fileChannel = fileChannel; + } + + @Override + public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { + fileChannel.read(dst, 0, attachment, new CompletionHandler() { + @Override + public void completed(Integer read, A attachment) { + handler.completed(read > 0 ? read : -1, attachment); + } + + @Override + public void failed(Throwable exc, A attachment) { + if (exc instanceof AsynchronousCloseException) { + handler.completed(-1, attachment); + return; + } + handler.failed(exc, attachment); + } + }); + } + + @Override + public Future read(ByteBuffer dst) { + CompletableFutureHandler future = new CompletableFutureHandler(); + fileChannel.read(dst, 0, null, future); + return future; + } + + @Override + public void write(ByteBuffer src, A attachment, CompletionHandler handler) { + fileChannel.write(src, 0, attachment, handler); + } + + @Override + public Future write(ByteBuffer src) { + return fileChannel.write(src, 0); + } + + @Override + public void close() throws IOException { + fileChannel.close(); + } + + @Override + public boolean isOpen() { + return fileChannel.isOpen(); + } + + private static class CompletableFutureHandler extends CompletableFuture implements CompletionHandler { + + @Override + public void completed(Integer read, Object attachment) { + complete(read > 0 ? read : -1); + } + + @Override + public void failed(Throwable exc, Object attachment) { + if (exc instanceof AsynchronousCloseException) { + complete(-1); + return; + } + completeExceptionally(exc); + } + } + } +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java new file mode 100644 index 000000000..a2840cb5f --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java @@ -0,0 +1,21 @@ +package com.github.dockerjava.transport; + +import javax.net.ssl.SSLContext; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; + +/** + * Get an SSL Config. Allows for various different implementations. + */ +public interface SSLConfig { + + /** + * Get the SSL Context, from wherever it comes (file, keystore). + * + * @return an SSL context. + */ + SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException, + KeyStoreException; +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java new file mode 100644 index 000000000..eb7a49b51 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java @@ -0,0 +1,111 @@ +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.InvocationTargetException; +import java.net.Socket; +import java.net.SocketAddress; +import java.net.SocketException; +import java.nio.ByteBuffer; +import java.nio.channels.Channels; +import java.nio.channels.SocketChannel; +import java.nio.channels.WritableByteChannel; + +public class UnixSocket extends AbstractSocket { + + /** + * Return a new {@link Socket} for the given path. Will use JDK's {@link java.net.UnixDomainSocketAddress} + * if available and fallback to {@link DomainSocket} otherwise. + * + * @param path the path to the domain socket + * @return a {@link Socket} instance + * @throws IOException if the socket cannot be opened + */ + public static Socket get(String path) throws IOException { + try { + return new UnixSocket(path); + } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | + IllegalAccessException e) { + //noinspection deprecation + return DomainSocket.get(path); + } + } + + private final SocketAddress socketAddress; + + private final SocketChannel socketChannel; + + private UnixSocket(String path) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, + IllegalAccessException, IOException { + Class unixDomainSocketAddress = Class.forName("java.net.UnixDomainSocketAddress"); + this.socketAddress = + (SocketAddress) unixDomainSocketAddress.getMethod("of", String.class) + .invoke(null, path); + this.socketChannel = SocketChannel.open(this.socketAddress); + } + + @Override + public InputStream getInputStream() throws IOException { + if (isClosed()) { + throw new SocketException("Socket is closed"); + } + if (!isConnected()) { + throw new SocketException("Socket is not connected"); + } + if (isInputShutdown()) { + throw new SocketException("Socket input is shutdown"); + } + + return Channels.newInputStream(socketChannel); + } + + @Override + public OutputStream getOutputStream() throws IOException { + if (isClosed()) { + throw new SocketException("Socket is closed"); + } + if (!isConnected()) { + throw new SocketException("Socket is not connected"); + } + if (isOutputShutdown()) { + throw new SocketException("Socket output is shutdown"); + } + + return Channels.newOutputStream(new WrappedWritableByteChannel()); + } + + @Override + public SocketAddress getLocalSocketAddress() { + return socketAddress; + } + + @Override + public SocketAddress getRemoteSocketAddress() { + return socketAddress; + } + + @Override + public void close() throws IOException { + super.close(); + this.socketChannel.close(); + } + + private class WrappedWritableByteChannel implements WritableByteChannel { + + @Override + public int write(ByteBuffer src) throws IOException { + return UnixSocket.this.socketChannel.write(src); + } + + @Override + public boolean isOpen() { + return UnixSocket.this.socketChannel.isOpen(); + } + + @Override + public void close() throws IOException { + UnixSocket.this.socketChannel.close(); + } + } +} diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 13b44f68b..3cfd7f255 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,32 +4,36 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 0-SNAPSHOT ../pom.xml docker-java - bundle + jar docker-java https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava + + - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} - ${groupId} + ${project.groupId} docker-java-transport-jersey - ${version} + ${project.version} - ${groupId} + ${project.groupId} docker-java-transport-netty - ${version} + ${project.version} @@ -39,6 +43,18 @@ + + ${project.groupId} + docker-java-transport-okhttp + ${project.version} + test + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + test + ch.qos.logback logback-core @@ -96,9 +112,38 @@ junit junit - 4.12 + 4.13 + test + + + org.awaitility + awaitility + 4.3.0 + test + + + + com.fasterxml.jackson.core + jackson-databind + + 2.20.1 test + + + com.fasterxml.jackson.core + jackson-annotations + + 2.20 + test + + + + org.projectlombok + lombok + 1.18.38 + provided + @@ -107,8 +152,8 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + false 3 com.github.dockerjava.junit.category.Integration @@ -127,9 +172,9 @@ + false 5 com.github.dockerjava.junit.category.Integration - com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration @@ -144,32 +189,6 @@ - - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.14.1 - - - - com.github.docker-java - docker-java - 3.1.0 - jar - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - - - - public - true - - - diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java index 991bdbb86..8100f285e 100644 --- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java +++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java @@ -2,51 +2,109 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.core.DefaultDockerClientConfig.Builder; import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; +import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DockerClientBuilder { - private DockerClientImpl dockerClient = null; + private final DockerClientConfig dockerClientConfig; private DockerCmdExecFactory dockerCmdExecFactory = null; - private DockerClientBuilder(DockerClientImpl dockerClient) { - this.dockerClient = dockerClient; + private DockerHttpClient dockerHttpClient = null; + + private DockerClientBuilder(DockerClientConfig dockerClientConfig) { + this.dockerClientConfig = dockerClientConfig; } public static DockerClientBuilder getInstance() { - return new DockerClientBuilder(DockerClientImpl.getInstance()); + return new DockerClientBuilder( + DefaultDockerClientConfig.createDefaultConfigBuilder().build() + ); } - public static DockerClientBuilder getInstance(Builder dockerClientConfigBuilder) { + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig)} + */ + @Deprecated + public static DockerClientBuilder getInstance(DefaultDockerClientConfig.Builder dockerClientConfigBuilder) { return getInstance(dockerClientConfigBuilder.build()); } public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) { - return new DockerClientBuilder(DockerClientImpl.getInstance(dockerClientConfig)); + return new DockerClientBuilder(dockerClientConfig); } + /** + * + * @deprecated use {@link DefaultDockerClientConfig.Builder#withDockerHost(String)} + */ + @Deprecated public static DockerClientBuilder getInstance(String serverUrl) { - return new DockerClientBuilder(DockerClientImpl.getInstance(serverUrl)); + return new DockerClientBuilder( + DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost(serverUrl) + .build() + ); } + /** + * + * @deprecated no replacement, use one of {@link DockerHttpClient} + */ + @Deprecated public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() { return new JerseyDockerCmdExecFactory(); } + /** + * Note that this method overrides {@link DockerHttpClient} if it was previously set + * + * @deprecated use {@link #withDockerHttpClient(DockerHttpClient)} + */ + @Deprecated public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { this.dockerCmdExecFactory = dockerCmdExecFactory; + this.dockerHttpClient = null; + return this; + } + + /** + * Note that this method overrides {@link DockerCmdExecFactory} if it was previously set + */ + public DockerClientBuilder withDockerHttpClient(DockerHttpClient dockerHttpClient) { + this.dockerCmdExecFactory = null; + this.dockerHttpClient = dockerHttpClient; return this; } public DockerClient build() { - if (dockerCmdExecFactory != null) { - dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory); + if (dockerHttpClient != null) { + return DockerClientImpl.getInstance( + dockerClientConfig, + dockerHttpClient + ); + } else if (dockerCmdExecFactory != null) { + return DockerClientImpl.getInstance(dockerClientConfig) + .withDockerCmdExecFactory(dockerCmdExecFactory); } else { - dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory()); - } + Logger log = LoggerFactory.getLogger(DockerClientBuilder.class); + log.warn( + "'dockerHttpClient' should be set. " + + "Falling back to Jersey, will be an error in future releases." + ); - return dockerClient; + return DockerClientImpl.getInstance( + dockerClientConfig, + new JerseyDockerHttpClient.Builder() + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()) + .build() + ); + } } } diff --git a/docker-java/src/main/resources/docker-java.properties b/docker-java/src/main/resources/docker-java.properties deleted file mode 100644 index fc9209c97..000000000 --- a/docker-java/src/main/resources/docker-java.properties +++ /dev/null @@ -1,11 +0,0 @@ -DOCKER_HOST=unix:///var/run/docker.sock -DOCKER_CONFIG=${user.home}/.docker -#DOCKER_TLS_VERIFY=1 -#DOCKER_CERT_PATH=${user.home}/.docker/certs - -api.version= -registry.url=https://index.docker.io/v1/ -registry.username=${user.name} -#registry.password= -#registry.email= - diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java index 1bdb5aa7a..1c7c1de6c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java @@ -2,11 +2,13 @@ import com.github.dockerjava.api.model.Binds; import com.github.dockerjava.api.model.BuildResponseItem; +import com.github.dockerjava.api.model.DockerObject; +import com.github.dockerjava.api.model.DockerObjectAccessor; import com.github.dockerjava.api.model.PullResponseItem; import com.github.dockerjava.api.model.PushResponseItem; import com.github.dockerjava.api.model.ResponseItem; import com.google.common.reflect.ClassPath.ClassInfo; -import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,12 +19,14 @@ import java.util.List; import static com.google.common.reflect.ClassPath.from; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith; -import static org.junit.Assert.assertThat; /** + * TODO use ArchUnit + * * @author Kanstantsin Shautsou */ public class ModelsSerializableTest { @@ -33,14 +37,24 @@ public class ModelsSerializableTest { BuildResponseItem.class.getName(), PullResponseItem.class.getName(), PushResponseItem.class.getName(), - ResponseItem.class.getName() + ResponseItem.class.getName(), + ResponseItem.ErrorDetail.class.getName(), + ResponseItem.ProgressDetail.class.getName() ); @Test public void allModelsSerializable() throws IOException, NoSuchFieldException, IllegalAccessException { final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - for (ClassInfo classInfo : from(contextClassLoader).getTopLevelClasses("com.github.dockerjava.api.model")) { - if (classInfo.getName().endsWith("Test")) { + for (ClassInfo classInfo : from(contextClassLoader).getAllClasses()) { + if (!classInfo.getPackageName().equals("com.github.dockerjava.api.model")) { + continue; + } + + if ( + classInfo.getName().endsWith("Test") + || DockerObject.class.getName().equals(classInfo.getName()) + || DockerObjectAccessor.class.getName().equals(classInfo.getName()) + ) { continue; } @@ -50,13 +64,13 @@ public void allModelsSerializable() throws IOException, NoSuchFieldException, Il continue; } - LOG.debug("aClass: {}", aClass); + LOG.debug("Checking: {}", aClass); assertThat(aClass, typeCompatibleWith(Serializable.class)); final Object serialVersionUID = FieldUtils.readDeclaredStaticField(aClass, "serialVersionUID", true); if (!excludeClasses.contains(aClass.getName())) { assertThat(serialVersionUID, instanceOf(Long.class)); - assertThat("Follow devel docs", (Long) serialVersionUID, is(1L)); + assertThat("Follow devel docs for " + aClass, (Long) serialVersionUID, is(1L)); } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java index 0cf5141d4..23ef4b7f2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java @@ -28,7 +28,9 @@ public enum CommandJSONSamples implements JSONResourceRef { inspectContainerResponse_full_1_21, inspectContainerResponse_full_1_26a, inspectContainerResponse_full_1_26b, - inspectContainerResponse_empty; + inspectContainerResponse_empty, + updateContainerResponse_empty, + updateContainerResponse_warnings; @Override public String getFileName() { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index f19bb1663..12105e8a1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -31,9 +31,9 @@ import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsNot.not; @@ -51,16 +51,16 @@ public class InspectContainerResponseTest { @Test public void roundTrip_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; // Check volumes: https://github.com/docker-java/docker-java/issues/211 - assertEquals(response.getVolumes().length, 2); - assertEquals(response.getVolumesRW().length, 2); - assertEquals(response.getVolumes()[1].getContainerPath(), "/bar/foo/myvol2"); - assertEquals(response.getVolumes()[1].getHostPath(), "/path2"); - assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2"); + assertEquals(2, response.getVolumes().length); + assertEquals(2, response.getVolumesRW().length); + assertEquals("/bar/foo/myvol2" ,response.getVolumes()[1].getContainerPath()); + assertEquals("/path2", response.getVolumes()[1].getHostPath()); + assertEquals("/bar/foo/myvol2", response.getVolumesRW()[1].getVolume().getPath()); assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean()); assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean()); assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log")); @@ -72,21 +72,21 @@ public void roundTrip_full_healthcheck() throws IOException { final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24, - "/containers/inspect/1.json", - type + "/containers/inspect/1.json", + type ); - - assertEquals(response.getState().getHealth().getStatus(), "healthy"); - assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0)); - assertEquals(response.getState().getHealth().getLog().size(), 2); - assertEquals(response.getState().getHealth().getLog().get(0).getOutput(), "Hello"); - assertEquals(response.getState().getHealth().getLog().get(1).getOutput(), "World"); + + assertEquals("healthy", response.getState().getHealth().getStatus()); + assertEquals(new Integer(0), response.getState().getHealth().getFailingStreak()); + assertEquals(2, response.getState().getHealth().getLog().size()); + assertEquals("Hello", response.getState().getHealth().getLog().get(0).getOutput()); + assertEquals("World", response.getState().getHealth().getLog().get(1).getOutput()); } @Test public void roundTrip_1_21_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_21, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; final InspectContainerResponse.ContainerState state = response.getState(); @@ -96,39 +96,39 @@ public void roundTrip_1_21_full() throws IOException { assertThat(state.getStatus(), containsString("running")); assertFalse(state.getRestarting()); assertFalse(state.getOOMKilled()); - assertThat(state.getError(), isEmptyString()); + assertThat(state.getError(), is(emptyString())); } @Test public void roundTrip_1_26a_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26a, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; final List mounts = response.getMounts(); - assertEquals(mounts.size(), 1); + assertEquals(1, mounts.size()); final InspectContainerResponse.Mount mount = mounts.get(0); final Volume volume = mount.getDestination(); - assertEquals(volume.getPath(), "/var/lib/postgresql/data"); + assertEquals("/var/lib/postgresql/data", volume.getPath()); } @Test public void roundTrip_1_26b_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26b, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; final List mounts = response.getMounts(); - assertEquals(mounts.size(), 1); + assertEquals(1, mounts.size()); final InspectContainerResponse.Mount mount = mounts.get(0); final Volume volume = mount.getDestination(); - assertEquals(volume.getPath(), "/srv/test"); + assertEquals("/srv/test", volume.getPath()); } @Test @@ -142,8 +142,8 @@ public void inspect_windows_container() throws IOException { final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38, - "/containers/inspect/lcow.json", - type + "/containers/inspect/lcow.json", + type ); assertThat(response, notNullValue()); @@ -157,7 +157,7 @@ public void inspect_windows_container() throws IOException { assertThat(response.getGraphDriver(), notNullValue()); assertThat(response.getGraphDriver().getName(), is("windowsfilter")); assertThat(response.getGraphDriver().getData(), is(new GraphData().withDir( - "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" ))); assertThat(response.getHostConfig(), notNullValue()); @@ -165,23 +165,23 @@ public void inspect_windows_container() throws IOException { assertThat(response.getImageId(), is("sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda")); assertThat(response.getLogPath(), is( - "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + - "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log" + "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + + "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log" )); assertThat(response.getName(), is("/cranky_clarke")); assertThat(response.getNetworkSettings(), notNullValue()); assertThat(response.getNetworkSettings().getNetworks(), is(Collections.singletonMap("nat", - new ContainerNetwork() - .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc") - .withGateway("172.17.18.1") - .withGlobalIPv6Address("") - .withGlobalIPv6PrefixLen(0) - .withIpv4Address("172.17.18.123") - .withIpPrefixLen(16) - .withIpV6Gateway("") - .withMacAddress("00:aa:ff:cf:dd:09") - .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7") + new ContainerNetwork() + .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc") + .withGateway("172.17.18.1") + .withGlobalIPv6Address("") + .withGlobalIPv6PrefixLen(0) + .withIpv4Address("172.17.18.123") + .withIpPrefixLen(16) + .withIpV6Gateway("") + .withMacAddress("00:aa:ff:cf:dd:09") + .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7") ))); assertThat(response.getPath(), is("cmd")); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java index 040f1c2d7..2449d39be 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; @@ -40,7 +40,7 @@ public void test_1_22_SerDer1() throws Exception { assertThat(processConfig.getEntryPoint(), is("/bin/bash")); assertThat(processConfig.getArguments(), hasSize(0)); assertThat(processConfig.isPrivileged(), is(false)); - assertThat(processConfig.getUser(), isEmptyString()); + assertThat(processConfig.getUser(), is(emptyString())); assertThat(execResponse.isOpenStdin(), is(false)); @@ -50,6 +50,6 @@ public void test_1_22_SerDer1() throws Exception { assertThat(execResponse.getContainerID(), is("ffa39805f089af3099e36452a985481f96170a9dff40be69d34d1722c7660d38")); - assertThat(execResponse.getDetachKeys(), isEmptyString()); + assertThat(execResponse.getDetachKeys(), is(emptyString())); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java index d548fa329..a7ec3a78d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -84,7 +84,7 @@ public void serder1_22Json() throws IOException { assertThat(inspectImage, notNullValue()); assertThat(inspectImage.getArch(), is("amd64")); assertThat(inspectImage.getAuthor(), is("hack@worldticket.net")); - assertThat(inspectImage.getComment(), isEmptyString()); + assertThat(inspectImage.getComment(), is(emptyString())); assertThat(inspectImage.getConfig(), notNullValue()); assertThat(inspectImage.getConfig(), equalTo(config)); @@ -98,7 +98,7 @@ public void serder1_22Json() throws IOException { assertThat(inspectImage.getDockerVersion(), is("0.8.1")); assertThat(inspectImage.getId(), is("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")); assertThat(inspectImage.getOs(), is("linux")); - assertThat(inspectImage.getParent(), isEmptyString()); + assertThat(inspectImage.getParent(), is(emptyString())); assertThat(inspectImage.getSize(), is(0L)); assertThat(inspectImage.getRepoTags(), hasSize(1)); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java new file mode 100644 index 000000000..300a5c324 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.UpdateContainerResponse; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; + +import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +public class UpdateContainerResponseTest { + @Test + public void roundTrip_empty() throws IOException { + UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_empty, UpdateContainerResponse.class); + assertNull(response.getWarnings()); + } + + @Test + public void roundTrip_warnings() throws IOException { + UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_warnings, + UpdateContainerResponse.class); + + List warnings = response.getWarnings(); + assertNotNull(warnings); + assertEquals(1, warnings.size()); + + final String warning = warnings.get(0); + assertEquals("Published ports are discarded when using host network mode", warning); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java index 9d08843dc..d5ff7044a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java @@ -15,17 +15,17 @@ public class AccessModeTest { @Test public void defaultAccessMode() { - assertEquals(AccessMode.DEFAULT, rw); + assertEquals(rw, AccessMode.DEFAULT); } @Test public void stringify() { - assertEquals(AccessMode.rw.toString(), "rw"); + assertEquals("rw", AccessMode.rw.toString()); } @Test public void fromString() { - assertEquals(AccessMode.valueOf("rw"), rw); + assertEquals(rw, AccessMode.valueOf("rw")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java index f77ac56c9..ae3e4a91b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java @@ -8,17 +8,16 @@ import java.io.IOException; import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; public class AuthConfigTest { @Test - public void defaultServerAddress() throws Exception { + public void defaultServerAddress() { assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/"); } @@ -89,4 +88,23 @@ public void shouldNotFailWithStackOrchestratorInConfig() throws IOException { assertThat(authConfig.getStackOrchestrator(), is("kubernetes")); } + @Test + public void toStringDoesNotContainSensitiveStrings() { + AuthConfig authConfig = new AuthConfig() + .withAuth("authValue") + .withEmail("emailValue") + .withPassword("passwordValue") + .withIdentityToken("identityTokenValue") + .withRegistrytoken("registryTokenValue") + .withRegistryAddress("registryAddressValue"); + String toStringValue = authConfig.toString(); + + assertThat(toStringValue, not(containsString("authValue"))); + assertThat(toStringValue, not(containsString("passwordValue"))); + assertThat(toStringValue, not(containsString("identityTokenValue"))); + assertThat(toStringValue, not(containsString("registryTokenValue"))); + + assertThat(toStringValue, containsString("emailValue")); + assertThat(toStringValue, containsString("registryAddressValue")); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java new file mode 100644 index 000000000..0fe65c048 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java @@ -0,0 +1,24 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +public class BindPropagationTest { + + @Test + public void toJson() throws Exception { + String value = JSONTestHelper.getMapper().writeValueAsString(BindPropagation.R_PRIVATE); + + assertThat(value, is("\"rprivate\"")); + } + + @Test + public void fromJson() throws Exception { + BindPropagation value = JSONTestHelper.getMapper().readValue("\"rprivate\"", BindPropagation.class); + + assertThat(value, is(BindPropagation.R_PRIVATE)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java index 3343bf6bd..d31a66dde 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java @@ -26,6 +26,113 @@ public void parseUsingDefaultAccessMode() { assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); } + @Test + public void parseReadWriteWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteNoCopyWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,nocopy"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), is(true)); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteSharedWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,shared"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED)); + } + + @Test + public void parseReadWriteSlaveWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,slave"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE)); + } + + @Test + public void parseReadWritePrivateWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,private"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE)); + } + + @Test + public void parseReadOnlyWindows() { + Bind bind = Bind.parse("C:\\host:/container:ro"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(ro)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseSELOnlyWindows() { + Bind bind = Bind.parse("C:\\host:/container:Z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT)); + assertThat(bind.getSecMode(), is(SELContext.single)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + + bind = Bind.parse("C:\\host:/container:z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT)); + assertThat(bind.getSecMode(), is(SELContext.shared)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteSELWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,Z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.single)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadOnlySELWindows() { + Bind bind = Bind.parse("C:\\host:/container:ro,z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(ro)); + assertThat(bind.getSecMode(), is(SELContext.shared)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + @Test public void parseReadWrite() { Bind bind = Bind.parse("/host:/container:rw"); @@ -59,6 +166,17 @@ public void parseReadWriteShared() { assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED)); } + @Test + public void parseReadWriteRshared() { + Bind bind = Bind.parse("/host:/container:rw,rshared"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RSHARED)); + } + @Test public void parseReadWriteSlave() { Bind bind = Bind.parse("/host:/container:rw,slave"); @@ -70,6 +188,17 @@ public void parseReadWriteSlave() { assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE)); } + @Test + public void parseReadWriteRslave() { + Bind bind = Bind.parse("/host:/container:rw,rslave"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RSLAVE)); + } + @Test public void parseReadWritePrivate() { Bind bind = Bind.parse("/host:/container:rw,private"); @@ -81,6 +210,17 @@ public void parseReadWritePrivate() { assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE)); } + @Test + public void parseReadWriteRprivate() { + Bind bind = Bind.parse("/host:/container:rw,rprivate"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RPRIVATE)); + } + @Test public void parseReadOnly() { Bind bind = Bind.parse("/host:/container:ro"); @@ -177,16 +317,31 @@ public void toStringReadWriteShared() { assertThat(Bind.parse("/host:/container:rw,shared").toString(), is("/host:/container:rw,shared")); } + @Test + public void toStringReadWriteRshared() { + assertThat(Bind.parse("/host:/container:rw,rshared").toString(), is("/host:/container:rw,rshared")); + } + @Test public void toStringReadWriteSlave() { assertThat(Bind.parse("/host:/container:rw,slave").toString(), is("/host:/container:rw,slave")); } + @Test + public void toStringReadWriteRslave() { + assertThat(Bind.parse("/host:/container:rw,rslave").toString(), is("/host:/container:rw,rslave")); + } + @Test public void toStringReadWritePrivate() { assertThat(Bind.parse("/host:/container:rw,private").toString(), is("/host:/container:rw,private")); } + @Test + public void toStringReadWriteRprivate() { + assertThat(Bind.parse("/host:/container:rw,rprivate").toString(), is("/host:/container:rw,rprivate")); + } + @Test public void toStringDefaultAccessMode() { assertThat(Bind.parse("/host:/container").toString(), is("/host:/container:rw")); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java new file mode 100644 index 000000000..83c5ba788 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +public class BindsTest { + + @Test + public void usesToJson() throws Exception { + Binds binds = new Binds( + Bind.parse("/foo:/bar:rw"), + Bind.parse("/bip:/bop:ro") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(binds); + + assertThat(json, is("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]")); + } + + @Test + public void usesFromJson() throws Exception { + Binds binds = JSONTestHelper.getMapper().readValue("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]", Binds.class); + + assertThat(binds, notNullValue()); + assertThat(binds.getBinds(), arrayContaining( + Bind.parse("/foo:/bar:rw"), + Bind.parse("/bip:/bop:ro") + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java index e76d2437c..b0652d945 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java @@ -11,13 +11,16 @@ public class CapabilityTest { @Test public void serializeCapability() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL); - assertEquals(json, "\"ALL\""); + assertEquals("\"ALL\"", json); } @Test public void deserializeCapability() throws Exception { Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class); - assertEquals(capability, Capability.ALL); + assertEquals(Capability.ALL, capability); + + Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class); + assertEquals(Capability.ALL, compatibleCapability); } @Test(expected = JsonMappingException.class) diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java index 18c6fbbc8..9d191fe52 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java @@ -54,7 +54,7 @@ public class DeviceTest { }}; @Test - public void testParse() throws Exception { + public void testParse() { assertThat(Device.parse("/dev/sda:/dev/xvdc:r"), equalTo(new Device("r", "/dev/xvdc", "/dev/sda"))); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java index 20999a92f..fce761380 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java @@ -16,13 +16,13 @@ public class ExposedPortTest { @Test public void parsePortAndProtocol() { ExposedPort exposedPort = ExposedPort.parse("80/tcp"); - assertEquals(exposedPort, new ExposedPort(80, TCP)); + assertEquals(new ExposedPort(80, TCP), exposedPort); } @Test public void parsePortOnly() { ExposedPort exposedPort = ExposedPort.parse("80"); - assertEquals(exposedPort, new ExposedPort(80, DEFAULT)); + assertEquals(new ExposedPort(80, DEFAULT), exposedPort); } @Test @@ -43,7 +43,7 @@ public void parseNull() { @Test public void stringify() { - assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp"); + assertEquals("80/tcp", ExposedPort.parse("80/tcp").toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java new file mode 100644 index 000000000..f46dddc68 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -0,0 +1,67 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.databind.JsonNode; +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.apache.commons.compress.utils.Lists; +import org.junit.Test; + +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.aMapWithSize; +import static org.hamcrest.Matchers.arrayContainingInAnyOrder; +import static org.hamcrest.Matchers.arrayWithSize; +import static org.hamcrest.Matchers.notNullValue; + +public class ExposedPortsTest { + + @Test + public void usesToJson() throws Exception { + ExposedPorts ports = new ExposedPorts( + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) + ); + String json = JSONTestHelper.getMapper().writeValueAsString(ports); + List> jsonEntries = getJsonEntries(json); + + String jsonExpected = "{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}"; + List> jsonEntriesExpected = getJsonEntries(jsonExpected); + + assertThat(jsonEntries.toArray(), arrayContainingInAnyOrder(jsonEntriesExpected.toArray())); + } + + private List> getJsonEntries(String json) throws Exception { + JsonNode jsonNode = JSONTestHelper.getMapper().readValue(json, JsonNode.class); + return Lists.newArrayList(jsonNode.fields()); + } + + @Test + public void usesFromJson() throws Exception { + ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}", ExposedPorts.class); + + assertThat(ports, notNullValue()); + assertThat(ports.getExposedPorts(), arrayContainingInAnyOrder( + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) + )); + } + + @Test + public void usesFromJsonWithDuplicate() { + ExposedPorts ports = new ExposedPorts( + new ExposedPort(80, InternetProtocol.UDP), + new ExposedPort(80), + new ExposedPort(80) + ); + + assertThat(ports, notNullValue()); + assertThat(ports.getExposedPorts(), arrayWithSize(3)); + + Map map = ports.toPrimitive(); + assertThat(map, aMapWithSize(2)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java new file mode 100644 index 000000000..5e13103dd --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java @@ -0,0 +1,15 @@ +package com.github.dockerjava.api.model; + +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class HostConfigTest { + + @Test + public void testNewObjectsEqual() { + assertThat(HostConfig.newHostConfig(), + equalTo(HostConfig.newHostConfig())); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java index c39706e51..3b8efa2c5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java @@ -17,26 +17,26 @@ public void testFromCompoundString() throws Exception { Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest"); assertTrue(!i1.tag.isPresent()); - assertEquals(i1.repository.name, "10.0.0.1/jim"); + assertEquals("10.0.0.1/jim", i1.repository.name); assertTrue(i2.tag.isPresent()); - assertEquals(i2.tag.get(), "123"); - assertEquals(i2.repository.name, "10.0.0.1/jim"); + assertEquals("123", i2.tag.get()); + assertEquals("10.0.0.1/jim", i2.repository.name); assertTrue(i3.tag.isPresent()); - assertEquals(i3.tag.get(), "124"); - assertEquals(i3.repository.name, "10.0.0.1:123/jim"); - assertEquals(i3.repository.getURL().getPort(), 123); - assertEquals(i3A.tag.get(), "latest"); + assertEquals("124", i3.tag.get()); + assertEquals("10.0.0.1:123/jim", i3.repository.name); + assertEquals(123, i3.repository.getURL().getPort()); + assertEquals("latest", i3A.tag.get()); Identifier i4 = Identifier.fromCompoundString("centos:latest"); assertTrue(i4.tag.isPresent()); - assertEquals(i4.tag.get(), "latest"); + assertEquals("latest", i4.tag.get()); Identifier i5 = Identifier.fromCompoundString("busybox"); assertTrue(!i5.tag.isPresent()); Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234"); - assertEquals(i6.repository.getPath(), "my-test-image"); + assertEquals("my-test-image", i6.repository.getPath()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java new file mode 100644 index 000000000..8f18facf0 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java @@ -0,0 +1,90 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.test.serdes.JSONSamples; +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +public class ImageHistoryTest { + + @Test + public void serderJson() throws IOException { + final List history = JSONTestHelper.getMapper().readValue( + JSONSamples.getSampleContent(VERSION_1_22, "images/history/history.json"), + new TypeReference>() { + } + ); + + assertThat(history, notNullValue()); + assertThat(history, hasSize(3)); + + final ImageHistory first = history.get(0); + assertThat(first.getId(), is("3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710")); + assertThat(first.getCreated(), is(1398108230L)); + assertThat(first.getCreatedBy(), is("/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /")); + assertThat(first.getTags(), hasSize(2)); + assertThat(first.getTags(), contains("ubuntu:lucid", "ubuntu:10.04")); + assertThat(first.getSize(), is(182964289L)); + assertThat(first.getComment(), is("")); + + final ImageHistory second = history.get(1); + assertThat(second.getId(), is("6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8")); + assertThat(second.getCreated(), is(1398108222L)); + assertThat(second.getTags(), empty()); + assertThat(second.getSize(), is(0L)); + + final ImageHistory third = history.get(2); + assertThat(third.getId(), is("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")); + assertThat(third.getCreated(), is(1371157430L)); + assertThat(third.getCreatedBy(), is("")); + assertThat(third.getTags(), contains("scratch12:latest", "scratch:latest")); + assertThat(third.getSize(), is(0L)); + assertThat(third.getComment(), is("Imported from -")); + + // Test round-trip serialization + final String serialized = JSONTestHelper.getMapper().writeValueAsString(history); + final List deserialized = JSONTestHelper.getMapper().readValue( + serialized, + new TypeReference>() { + } + ); + assertThat(deserialized, hasSize(3)); + assertThat(deserialized.get(0).getId(), is(first.getId())); + assertThat(deserialized.get(0).getCreated(), is(first.getCreated())); + assertThat(deserialized.get(0).getCreatedBy(), is(first.getCreatedBy())); + assertThat(deserialized.get(0).getTags(), is(first.getTags())); + assertThat(deserialized.get(0).getSize(), is(first.getSize())); + assertThat(deserialized.get(0).getComment(), is(first.getComment())); + } + + @Test + public void builderPattern() { + final ImageHistory history = new ImageHistory() + .withId("abc123") + .withCreated(1234567890L) + .withCreatedBy("/bin/sh -c echo hello") + .withTags(Arrays.asList("myimage:latest")) + .withSize(1024L) + .withComment("test comment"); + + assertThat(history.getId(), is("abc123")); + assertThat(history.getCreated(), is(1234567890L)); + assertThat(history.getCreatedBy(), is("/bin/sh -c echo hello")); + assertThat(history.getTags(), contains("myimage:latest")); + assertThat(history.getSize(), is(1024L)); + assertThat(history.getComment(), is("test comment")); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java index 10b401685..71d4d60d4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -80,9 +80,9 @@ public void serder1Json() throws IOException { assertThat(info.getExperimentalBuild(), is(false)); - assertThat(info.getHttpProxy(), isEmptyString()); - assertThat(info.getHttpsProxy(), isEmptyString()); - assertThat(info.getNoProxy(), isEmptyString()); + assertThat(info.getHttpProxy(), is(emptyString())); + assertThat(info.getHttpsProxy(), is(emptyString())); + assertThat(info.getNoProxy(), is(emptyString())); assertThat(info.getOomKillDisable(), is(true)); assertThat(info.getOsType(), equalTo("linux")); @@ -234,9 +234,9 @@ public void serder2Json() throws IOException { assertThat(info.getExperimentalBuild(), is(false)); - assertThat(info.getHttpProxy(), isEmptyString()); - assertThat(info.getHttpsProxy(), isEmptyString()); - assertThat(info.getNoProxy(), isEmptyString()); + assertThat(info.getHttpProxy(), is(emptyString())); + assertThat(info.getHttpsProxy(), is(emptyString())); + assertThat(info.getNoProxy(), is(emptyString())); assertThat(info.getOomKillDisable(), is(true)); assertThat(info.getOsType(), equalTo("linux")); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java index 5efb8d2c3..0421e1411 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java @@ -13,22 +13,22 @@ public class InternetProtocolTest { @Test public void defaultProtocol() { - assertEquals(InternetProtocol.DEFAULT, TCP); + assertEquals(TCP, InternetProtocol.DEFAULT); } @Test public void stringify() { - assertEquals(TCP.toString(), "tcp"); + assertEquals("tcp", TCP.toString()); } @Test public void parseUpperCase() { - assertEquals(InternetProtocol.parse("TCP"), TCP); + assertEquals(TCP, InternetProtocol.parse("TCP")); } @Test public void parseLowerCase() { - assertEquals(InternetProtocol.parse("tcp"), TCP); + assertEquals(TCP, InternetProtocol.parse("tcp")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java index 18363a9ee..b780eb22f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java @@ -14,15 +14,15 @@ public class LinkTest { @Test public void parse() { Link link = Link.parse("name:alias"); - assertEquals(link.getName(), "name"); - assertEquals(link.getAlias(), "alias"); + assertEquals("name", link.getName()); + assertEquals("alias", link.getAlias()); } @Test public void parseWithContainerNames() { Link link = Link.parse("/name:/conatiner/alias"); - assertEquals(link.getName(), "name"); - assertEquals(link.getAlias(), "alias"); + assertEquals("name", link.getName()); + assertEquals("alias", link.getAlias()); } @Test @@ -43,7 +43,7 @@ public void parseNull() { @Test public void stringify() { - assertEquals(Link.parse("name:alias").toString(), "name:alias"); + assertEquals("name:alias", Link.parse("name:alias").toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java new file mode 100644 index 000000000..0cf496412 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +public class LinksTest { + + @Test + public void usesToJson() throws Exception { + Links links = new Links( + new Link("/foo", "/bar"), + new Link("bip", "bop") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(links); + + assertThat(json, is("[\"/foo:/bar\",\"bip:bop\"]")); + } + + @Test + public void usesFromJson() throws Exception { + Links links = JSONTestHelper.getMapper().readValue("[\"/foo:/bar\",\"bip:bop\"]", Links.class); + + assertThat(links, notNullValue()); + assertThat(links.getLinks(), arrayContaining( + new Link("foo", "bar"), + new Link("bip", "bop") + )); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java index 3849a6094..9190cfda4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java @@ -23,27 +23,27 @@ public void fullDefinition() { @Test public void noProtocol() { - assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080), PortBinding.parse("127.0.0.1:80:8080")); } @Test public void noHostIp() { - assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.bindPort(80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080/tcp")); } @Test public void portsOnly() { - assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.bindPort(80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080")); } @Test public void exposedPortOnly() { - assertEquals(PortBinding.parse("8080"), new PortBinding(Binding.empty(), TCP_8080)); + assertEquals(new PortBinding(Binding.empty(), TCP_8080), PortBinding.parse("8080")); } @Test public void dynamicHostPort() { - assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080)); + assertEquals(new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080), PortBinding.parse("127.0.0.1::8080")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java index 02b3047e7..484e5897f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java @@ -36,9 +36,9 @@ public void addTwoBindingsForDifferentExposedPorts() { Map bindings = ports.getBindings(); // two keys with one value each - assertEquals(bindings.size(), 2); - assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080}); - assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090}); + assertEquals(2, bindings.size()); + assertArrayEquals(new Binding[] {BINDING_8080}, bindings.get(TCP_80)); + assertArrayEquals(new Binding[] {BINDING_9090}, bindings.get(TCP_90)); } @Test @@ -47,8 +47,8 @@ public void addTwoBindingsForSameExposedPort() { Map bindings = ports.getBindings(); // one key with two values - assertEquals(bindings.size(), 1); - assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090}); + assertEquals(1, bindings.size()); + assertArrayEquals(new Binding[] {BINDING_8080, BINDING_9090}, bindings.get(TCP_80)); } @Test @@ -56,7 +56,7 @@ public void addNullBindings() { ports.add(new PortBinding(null, TCP_80)); Map bindings = ports.getBindings(); // one key with two values - assertEquals(bindings.size(), 1); + assertEquals(1, bindings.size()); assertNull(bindings.get(TCP_80)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java index ecbdd9a49..2f528556f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java @@ -19,12 +19,12 @@ public class PortsSerializingTest { public void deserializingPortWithMultipleBindings() throws Exception { Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class); Map map = ports.getBindings(); - assertEquals(map.size(), 1); + assertEquals(1, map.size()); Binding[] bindings = map.get(ExposedPort.tcp(80)); - assertEquals(bindings.length, 2); - assertEquals(bindings[0], new Binding("10.0.0.1", "80")); - assertEquals(bindings[1], new Binding("10.0.0.2", "80")); + assertEquals(2, bindings.length); + assertEquals(new Binding("10.0.0.1", "80"), bindings[0]); + assertEquals(new Binding("10.0.0.2", "80"), bindings[1]); } @Test @@ -32,20 +32,20 @@ public void serializingPortWithMultipleBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80")); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80")); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort); + assertEquals(jsonWithDoubleBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports)); } @Test public void serializingEmptyBinding() throws Exception { Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null)); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}"); + assertEquals("{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}", JSONTestHelper.getMapper().writeValueAsString(ports)); } @Test public void deserializingPortWithNullBindings() throws Exception { Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class); Map map = ports.getBindings(); - assertEquals(map.size(), 1); + assertEquals(1, map.size()); assertNull(map.get(ExposedPort.tcp(80))); } @@ -54,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception { public void serializingWithNullBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), null); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort); + assertEquals(jsonWithNullBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java index 486badd55..f73036864 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java @@ -29,6 +29,14 @@ * @author Zach Marshall */ public class PullResponseItemTest { + @Test + public void imageAlreadyExists() throws IOException { + PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_alreadyExists, + PullResponseItem.class); + assertTrue(response.isPullSuccessIndicated()); + assertFalse(response.isErrorIndicated()); + } + @Test public void pullNewerImage() throws IOException { PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage, diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java index 31cdf0f3b..4997a390a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java @@ -23,7 +23,9 @@ * @author Zach Marshall */ public enum PullResponseJSONSamples implements JSONResourceRef { - pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate; + pullImageResponse_legacy, pullImageResponse_error, + pullImageResponse_newerImage, pullImageResponse_upToDate, + pullImageResponse_alreadyExists; @Override public String getFileName() { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java index fb79c0ca9..57dbc1b9f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java @@ -13,32 +13,32 @@ public class RestartPolicyParsingTest { @Test - public void noRestart() throws Exception { - assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart()); + public void noRestart() { + assertEquals(RestartPolicy.noRestart(), RestartPolicy.parse("no")); } @Test - public void alwaysRestart() throws Exception { - assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart()); + public void alwaysRestart() { + assertEquals(RestartPolicy.alwaysRestart(), RestartPolicy.parse("always")); } @Test - public void unlessStoppedRestart() throws Exception { - assertEquals(RestartPolicy.parse("unless-stopped"), RestartPolicy.unlessStoppedRestart()); + public void unlessStoppedRestart() { + assertEquals(RestartPolicy.unlessStoppedRestart(), RestartPolicy.parse("unless-stopped")); } @Test - public void onFailureRestart() throws Exception { - assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0)); + public void onFailureRestart() { + assertEquals(RestartPolicy.onFailureRestart(0), RestartPolicy.parse("on-failure")); } @Test - public void onFailureRestartWithCount() throws Exception { - assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2)); + public void onFailureRestartWithCount() { + assertEquals(RestartPolicy.onFailureRestart(2), RestartPolicy.parse("on-failure:2")); } @Test - public void illegalSyntax() throws Exception { + public void illegalSyntax() { expectedEx.expect(IllegalArgumentException.class); expectedEx.expectMessage("Error parsing RestartPolicy 'nonsense'"); @@ -46,7 +46,7 @@ public void illegalSyntax() throws Exception { } @Test - public void illegalRetryCount() throws Exception { + public void illegalRetryCount() { expectedEx.expect(IllegalArgumentException.class); expectedEx.expectMessage("Error parsing RestartPolicy 'on-failure:X'"); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java index 6e4524fd5..c9c6a897d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java @@ -15,35 +15,35 @@ public class RestartPolicySerializingTest { // --restart no public void noRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.noRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"\"}", json); } @Test // --restart always public void alwaysRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.alwaysRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"always\"}", json); } @Test // --restart unless-stopped public void unlessStoppedRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.unlessStoppedRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}", json); } @Test // --restart on-failure public void onFailureRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(0)); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}", json); } @Test // --restart on-failure:2 public void onFailureRestartWithCount() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(2)); - assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}"); + assertEquals("{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}", json); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java index 4d9fa8cbc..e32f97341 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java @@ -18,8 +18,8 @@ public static Object[][] restartPolicies() { public String policy; @Test - public void serializationWithoutCount() throws Exception { - assertEquals(RestartPolicy.parse(policy).toString(), policy); + public void serializationWithoutCount() { + assertEquals(policy, RestartPolicy.parse(policy).toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java new file mode 100644 index 000000000..12d1a0d36 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java @@ -0,0 +1,36 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +public class UlimitsTest { + + @Test + public void usesToJson() throws Exception { + Ulimit[] ulimits = new Ulimit[]{ + new Ulimit("nproc", 709, 1026), + new Ulimit("nofile", 1024, 4096), + new Ulimit("core", 99999999998L, 99999999999L) + }; + String json = JSONTestHelper.getMapper().writeValueAsString(ulimits); + + assertThat(json, is("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]")); + } + + @Test + public void usesFromJson() throws Exception { + Ulimit[] ulimits = JSONTestHelper.getMapper().readValue("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]", Ulimit[].class); + + assertThat(ulimits, notNullValue()); + assertThat(ulimits, arrayContaining( + new Ulimit("nproc", 709, 1026), + new Ulimit("nofile", 1024, 4096), + new Ulimit("core", 99999999998L, 99999999999L) + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java index 0d509dbfa..7f38eb0f0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java @@ -6,18 +6,31 @@ import java.io.IOException; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; +import static org.hamcrest.MatcherAssert.assertThat; public class VolumeBindsTest { + @Test + public void usesToJson() throws Exception { + VolumeBinds binds = new VolumeBinds( + new VolumeBind("/bar", "/foo"), + new VolumeBind("/bop", "/bip") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(binds); + + assertThat(json, is("{\"/foo\":\"/bar\",\"/bip\":\"/bop\"}")); + } + @Test public void t() throws IOException { String s = "{\"/data\":\"/some/path\"}"; VolumeBinds volumeBinds = JSONTestHelper.getMapper().readValue(s, VolumeBinds.class); VolumeBind[] binds = volumeBinds.getBinds(); - assertEquals(binds.length, 1); - assertEquals(binds[0].getHostPath(), "/some/path"); - assertEquals(binds[0].getContainerPath(), "/data"); + assertEquals(1, binds.length); + assertEquals("/some/path", binds[0].getHostPath()); + assertEquals("/data", binds[0].getContainerPath()); } @Test(expected = JsonMappingException.class) diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java index ae343047c..6155f88e3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java @@ -18,7 +18,7 @@ public void deserializing() throws Exception { @Test public void serializing() throws Exception { VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(volumeFrom), json); + assertEquals(json, JSONTestHelper.getMapper().writeValueAsString(volumeFrom)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java index cb1c4befd..20e28a55d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java @@ -7,6 +7,6 @@ public class VolumeTest { @Test public void getPath() { - assertEquals(new Volume("/path").getPath(), "/path"); + assertEquals("/path", new Volume("/path").getPath()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java new file mode 100644 index 000000000..ed52ff82d --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +public class VolumesRWTest { + + @Test + public void usesToJson() throws Exception { + VolumesRW volumes = new VolumesRW( + new VolumeRW(new Volume("/foo")), + new VolumeRW(new Volume("/bar"), AccessMode.ro) + ); + String json = JSONTestHelper.getMapper().writeValueAsString(volumes); + + assertThat(json, is("{\"/foo\":true,\"/bar\":false}")); + } + + @Test + public void usesFromJson() throws Exception { + VolumesRW volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":true,\"/bar\":false}", VolumesRW.class); + + assertThat(volumes, notNullValue()); + assertThat(volumes.getVolumesRW(), arrayContaining( + new VolumeRW(new Volume("/foo")), + new VolumeRW(new Volume("/bar"), AccessMode.ro) + )); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java new file mode 100644 index 000000000..d39e02583 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +public class VolumesTest { + + @Test + public void usesToJson() throws Exception { + Volumes volumes = new Volumes( + new Volume("/foo"), + new Volume("/bar") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(volumes); + + assertThat(json, is("{\"/foo\":{},\"/bar\":{}}")); + } + + @Test + public void usesFromJson() throws Exception { + Volumes volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":{},\"/bar\":{}}", Volumes.class); + + assertThat(volumes, notNullValue()); + assertThat(volumes.getVolumes(), arrayContaining( + new Volume("/foo"), + new Volume("/bar") + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index ba0128b78..dde47e2d8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -1,38 +1,31 @@ package com.github.dockerjava.cmd; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; -import com.github.dockerjava.core.command.AttachContainerResultCallback; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayInputStream; -import java.io.Closeable; import java.io.File; -import java.io.InputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeThat; +import static org.junit.Assert.*; /** * @author Kanstantsin Shautsou @@ -48,48 +41,50 @@ public class AttachContainerCmdIT extends CmdIT { public void attachContainerWithStdin() throws Exception { DockerClient dockerClient = dockerRule.getClient(); - assumeThat(getFactoryType(), is(FactoryType.NETTY)); - String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd("busybox") - .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line") - .withTty(false) - .withStdinOpen(true) - .exec(); + .withCmd("/bin/sh", "-c", "read line && echo $line") + .withTty(false) + .withAttachStdin(true) + .withAttachStdout(true) + .withAttachStderr(true) + .withStdinOpen(true) + .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); - - dockerClient.startContainerCmd(container.getId()).exec(); - - InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); - - assertThat(inspectContainerResponse.getState().getRunning(), is(true)); + assertThat(container.getId(), not(is(emptyString()))); AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { - assertEquals(frame.getStreamType(), StreamType.STDOUT); + assertEquals(StreamType.STDOUT, frame.getStreamType()); super.onNext(frame); } }; - PipedOutputStream out = new PipedOutputStream(); - PipedInputStream in = new PipedInputStream(out); - - dockerClient.attachContainerCmd(container.getId()) + try ( + PipedOutputStream out = new PipedOutputStream(); + PipedInputStream in = new PipedInputStream(out) + ) { + dockerClient.attachContainerCmd(container.getId()) .withStdErr(true) .withStdOut(true) .withFollowStream(true) .withStdIn(in) .exec(callback); - out.write((snippet + "\n").getBytes()); - out.flush(); + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); - callback.awaitCompletion(15, SECONDS); - callback.close(); + dockerClient.startContainerCmd(container.getId()).exec(); + + out.write((snippet + "\n").getBytes()); + out.flush(); + + callback.awaitCompletion(15, SECONDS); + callback.close(); + } assertThat(callback.toString(), containsString(snippet)); } @@ -101,30 +96,36 @@ public void attachContainerWithoutTTY() throws Exception { String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", snippet) - .withTty(false) - .exec(); + .withCmd("echo", snippet) + .withTty(false) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); - - dockerClient.startContainerCmd(container.getId()).exec(); + assertThat(container.getId(), not(is(emptyString()))); AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT)); super.onNext(frame); - }; + } }; dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .withLogs(true) - .exec(callback) - .awaitCompletion(30, TimeUnit.SECONDS); + .withStdErr(true) + .withStdOut(true) + .withFollowStream(true) + .withLogs(true) + .exec(callback); + + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); + + dockerClient.startContainerCmd(container.getId()).exec(); + + callback.awaitCompletion(30, TimeUnit.SECONDS); callback.close(); assertThat(callback.toString(), containsString(snippet)); @@ -135,82 +136,50 @@ public void attachContainerWithTTY() throws Exception { DockerClient dockerClient = dockerRule.getClient(); File baseDir = new File(Thread.currentThread().getContextClassLoader() - .getResource("attachContainerTestDockerfile").getFile()); + .getResource("attachContainerTestDockerfile").getFile()); String imageId = dockerRule.buildImage(baseDir); - CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec(); + CreateContainerResponse container = dockerClient.createContainerCmd(imageId) + .withTty(true) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); - dockerClient.startContainerCmd(container.getId()).exec(); AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { assertThat(frame.getStreamType(), equalTo(StreamType.RAW)); super.onNext(frame); - }; + } }; dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .exec(callback) - .awaitCompletion(15, TimeUnit.SECONDS); - callback.close(); - - LOG.debug("log: {}", callback.toString()); - - // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0); - assertThat(callback.toString(), containsString("stdout\r\nstderr")); - } + .withStdErr(true) + .withStdOut(true) + .withFollowStream(true) + .exec(callback); - @Test - public void attachContainerStdinUnsupported() throws Exception { - - DockerClient dockerClient = dockerRule.getClient(); - if (getFactoryType() == FactoryType.JERSEY) { - expectedException.expect(UnsupportedOperationException.class); - } - - String snippet = "hello world"; - - CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", snippet) - .withTty(false) - .exec(); - - LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); dockerClient.startContainerCmd(container.getId()).exec(); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { - @Override - public void onNext(Frame frame) { - assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT)); - super.onNext(frame); - }; - }; + callback.awaitCompletion(15, TimeUnit.SECONDS); + callback.close(); - InputStream stdin = new ByteArrayInputStream("".getBytes()); + LOG.debug("log: {}", callback.toString()); - dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .withLogs(true) - .withStdIn(stdin) - .exec(callback) - .awaitCompletion(30, TimeUnit.SECONDS); - callback.close(); + // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0); + assertThat(callback.toString(), containsString("stdout\r\nstderr")); } /** - * {@link AttachContainerResultCallback#onComplete()} should be called immediately after + * {@link ResultCallback#onComplete()} should be called immediately after * container exit. It was broken for Netty and TLS connection. */ @Test @@ -218,68 +187,50 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { DockerClient dockerClient = dockerRule.getClient(); CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", "hello") - .withTty(false) - .exec(); + .withCmd("echo", "hello") + .withTty(false) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); - final CountDownLatch started = new CountDownLatch(1); - final AtomicLong startedAtNanos = new AtomicLong(); - final CountDownLatch gotLine = new CountDownLatch(1); - final CountDownLatch completed = new CountDownLatch(1); - final AtomicLong gotLineAtNanos = new AtomicLong(); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { - @Override - public void onStart(Closeable stream) { - startedAtNanos.set(System.nanoTime()); - started.countDown(); - super.onStart(stream); - } - - @Override - public void onNext(Frame item) { - LOG.info("Got frame: {}", item); - if (item.getStreamType() == StreamType.STDOUT) { - gotLineAtNanos.set(System.nanoTime()); - gotLine.countDown(); - } - super.onNext(item); - } - - @Override - public void onError(Throwable throwable) { - LOG.info("Got error: ", throwable); - super.onError(throwable); - } - - @Override - public void onComplete() { - completed.countDown(); - super.onComplete(); - } - }; - - try (Closeable ignored = callback) { - dockerClient.attachContainerCmd(container.getId()) - .withStdOut(true) - .withFollowStream(true) - .exec(callback); + CountDownLatch gotLine = new CountDownLatch(1); + try ( + ResultCallback.Adapter resultCallback = dockerClient.attachContainerCmd(container.getId()) + .withStdOut(true) + .withStdErr(true) + .withFollowStream(true) + .exec(new ResultCallback.Adapter() { + @Override + public void onNext(Frame item) { + LOG.info("Got frame: {}", item); + if (item.getStreamType() == StreamType.STDOUT) { + gotLine.countDown(); + } + super.onNext(item); + } + + @Override + public void onComplete() { + LOG.info("On complete"); + super.onComplete(); + } + }) + ) { + resultCallback.awaitStarted(5, SECONDS); + LOG.info("Attach started"); dockerClient.startContainerCmd(container.getId()).exec(); + LOG.info("Container started"); - assertTrue("Should start in a reasonable time", started.await(30, SECONDS)); assertTrue("Should get first line quickly after the start", gotLine.await(15, SECONDS)); - long gotLineDurationSeconds = (gotLineAtNanos.get() - startedAtNanos.get()) / 1_000_000_000L; - LOG.info("Got line from {} for {} seconds", container.getId(), gotLineDurationSeconds); - - boolean finished = completed.await(1L + gotLineDurationSeconds, SECONDS); - assertTrue("Should get EOF in a time close to time of getting the first line", finished); + resultCallback.awaitCompletion(5, SECONDS); } } - public static class AttachContainerTestCallback extends AttachContainerResultCallback { - private StringBuffer log = new StringBuffer(); + public static class AttachContainerTestCallback extends ResultCallback.Adapter { + private final StringBuffer log = new StringBuffer(); @Override public void onNext(Frame item) { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java index bae21acdd..d37bea819 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java @@ -4,14 +4,13 @@ import com.github.dockerjava.api.model.AuthResponse; import com.github.dockerjava.core.DockerClientBuilder; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.junit.DockerMatchers.apiVersionGreater; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertThrows; import static org.junit.Assume.assumeThat; /** @@ -19,11 +18,8 @@ */ public class AuthCmdIT extends CmdIT { - @Rule - public ExpectedException expectedEx = ExpectedException.none(); - @Test - public void testAuth() throws Exception { + public void testAuth() { assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22)); AuthResponse response = dockerRule.getClient().authCmd().exec(); @@ -32,16 +28,14 @@ public void testAuth() throws Exception { } - @Ignore("Disabled because of 500/InternalServerException") @Test - public void testAuthInvalid() throws Exception { - expectedEx.expect(UnauthorizedException.class); - expectedEx.expectMessage("Wrong login/password, please try again"); - - DockerClientBuilder.getInstance(dockerRule.config("garbage")) + public void testAuthInvalid() { + assertThrows("Wrong login/password, please try again", UnauthorizedException.class, () -> { + DockerClientBuilder.getInstance(dockerRule.config("garbage")) .build() .authCmd() .exec(); + }); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index aae6380d8..d514ed59c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -6,14 +6,12 @@ import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.core.util.CompressArchiveUtil; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -33,13 +31,16 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_27; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_28; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.apache.commons.io.FileUtils.writeStringToFile; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assume.assumeThat; @@ -51,6 +52,9 @@ public class BuildImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public TemporaryFolder folder = new TemporaryFolder(new File("target/")); @@ -91,7 +95,7 @@ public void onBuild() throws Exception { dockerRule.getClient().buildImageCmd(baseDir) .withNoCache(true) .withTag("docker-java-onbuild") - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); baseDir = fileFromBuildTestResource("ONBUILD/child"); @@ -144,39 +148,39 @@ private String dockerfileBuild(File baseDir) throws Exception { } private String execBuild(BuildImageCmd buildImageCmd) throws Exception { - String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + String imageId = buildImageCmd.withNoCache(true).start().awaitImageId(); // Create container based on image CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); return dockerRule.containerLog(container.getId()); } @Test(expected = DockerClientException.class) - public void dockerignoreDockerfileIgnored() throws Exception { + public void dockerignoreDockerfileIgnored() { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test - public void dockerignoreDockerfileNotIgnored() throws Exception { + public void dockerignoreDockerfileNotIgnored() { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test(expected = DockerClientException.class) - public void dockerignoreInvalidDockerIgnorePattern() throws Exception { + public void dockerignoreInvalidDockerIgnorePattern() { File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test @@ -195,7 +199,7 @@ public void env() throws Exception { @Test public void fromPrivateRegistry() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); String imgName = authConfig.getRegistryAddress() + "/testuser/busybox"; File dockerfile = folder.newFile("Dockerfile"); @@ -212,7 +216,7 @@ public void fromPrivateRegistry() throws Exception { dockerRule.getClient().pushImageCmd(imgName) .withTag("latest") .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); dockerRule.getClient().removeImageCmd(imgName) @@ -228,7 +232,7 @@ public void fromPrivateRegistry() throws Exception { String imageId = dockerRule.getClient().buildImageCmd(baseDir) .withNoCache(true) .withBuildAuthConfigs(authConfigurations) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -237,11 +241,11 @@ public void fromPrivateRegistry() throws Exception { } @Test - public void buildArgs() throws Exception { + public void buildArgs() { File baseDir = fileFromBuildTestResource("buildArgs"); String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+") - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -252,14 +256,14 @@ public void buildArgs() throws Exception { } @Test - public void labels() throws Exception { + public void labels() { assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_23)); File baseDir = fileFromBuildTestResource("labels"); String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true) .withLabels(Collections.singletonMap("test", "abc")) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -270,7 +274,7 @@ public void labels() throws Exception { } @Test - public void multipleTags() throws Exception { + public void multipleTags() { assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_21)); @@ -279,7 +283,7 @@ public void multipleTags() throws Exception { String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true) .withTag("fallback-when-withTags-not-called") .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2"))) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -291,19 +295,19 @@ public void multipleTags() throws Exception { } @Test - public void cacheFrom() throws Exception { + public void cacheFrom() { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_27)); File baseDir1 = fileFromBuildTestResource("CacheFrom/test1"); String imageId1 = dockerRule.getClient().buildImageCmd(baseDir1) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse1 = dockerRule.getClient().inspectImageCmd(imageId1).exec(); assertThat(inspectImageResponse1, not(nullValue())); File baseDir2 = fileFromBuildTestResource("CacheFrom/test2"); String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1))) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse2 = dockerRule.getClient().inspectImageCmd(imageId2).exec(); assertThat(inspectImageResponse2, not(nullValue())); @@ -313,6 +317,39 @@ public void cacheFrom() throws Exception { } + @Test + public void quiet() { + File baseDir = fileFromBuildTestResource("labels"); + + String imageId = dockerRule.getClient() + .buildImageCmd(baseDir) + .withQuiet(true) + .start() + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + assertThat(inspectImageResponse.getId(), endsWith(imageId)); + LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + } + + @Test + public void extraHosts() { + assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_28)); + + File baseDir = fileFromBuildTestResource("labels"); + + String imageId = dockerRule.getClient() + .buildImageCmd(baseDir) + .withExtraHosts(new HashSet<>(Arrays.asList("host1"))) + .start() + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + } + public void dockerfileNotInBaseDirectory() throws Exception { File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory"); File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile"); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 1a74a0a63..b01cb1e90 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -1,42 +1,39 @@ package com.github.dockerjava.cmd; -import com.github.dockerjava.junit.DockerRule; +import com.github.dockerjava.core.DockerClientBuilder; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.core.DockerRule; +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; import com.github.dockerjava.junit.category.Integration; +import com.github.dockerjava.transport.DockerHttpClient; import org.junit.Rule; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; - -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY; /** * @author Kanstantsin Shautsou */ @Category(Integration.class) -@RunWith(Parameterized.class) public abstract class CmdIT { - public enum FactoryType { - NETTY, JERSEY - } - @Parameterized.Parameters(name = "{index}:{0}") - public static Iterable data() { - return Arrays.asList( - NETTY, JERSEY + public static DockerHttpClient createDockerHttpClient(DockerClientConfig config) { + return new TrackingDockerHttpClient( + new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .build() ); } - @Parameterized.Parameter - public FactoryType factoryType; - - public FactoryType getFactoryType() { - return factoryType; + public static DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerHttpClient(createDockerHttpClient(config)) + .build(); } @Rule - public DockerRule dockerRule = new DockerRule( this); + public DockerRule dockerRule = new DockerRule(); + @Rule + public DockerHttpClientLeakDetector leakDetector = new DockerHttpClientLeakDetector(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java index dd4a23b47..bd87d4aab 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.google.common.collect.ImmutableMap; import org.junit.Test; import org.slf4j.Logger; @@ -12,12 +11,12 @@ import java.util.Map; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -33,7 +32,7 @@ public void commit() throws DockerException, InterruptedException { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container: {}", container.toString()); @@ -47,9 +46,6 @@ public void commit() throws DockerException, InterruptedException { InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); LOG.info("Image Inspect: {}", inspectImageResponse.toString()); - assertThat(inspectImageResponse, hasField("container", startsWith(container.getId()))); - assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo(DEFAULT_IMAGE)); - InspectImageResponse busyboxImg = dockerRule.getClient().inspectImageCmd("busybox").exec(); assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId())); @@ -63,11 +59,11 @@ public void commitWithLabels() throws DockerException { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); Integer status = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(status, is(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java index ed235fb8c..40b552611 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java @@ -9,13 +9,12 @@ import net.jcip.annotations.ThreadSafe; import org.junit.Test; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -27,7 +26,7 @@ public class ConnectToNetworkCmdIT extends CmdIT { @Test public void connectToNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "connectToNetwork" + dockerRule.getKind(); + String networkName = "connectToNetwork"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -49,13 +48,13 @@ public void connectToNetwork() throws InterruptedException { public void connectToNetworkWithContainerNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - final String subnetPrefix = getFactoryType() == JERSEY ? "10.100.102" : "10.100.103"; - final String networkName = "ContainerWithNetwork" + dockerRule.getKind(); + final String subnetPrefix = "10.100.100"; + final String networkName = "ContainerWithNetwork"; final String containerIp = subnetPrefix + ".100"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sleep", "9999") - .exec(); + .withCmd("sleep", "9999") + .exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -65,20 +64,20 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { } CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd() - .withName(networkName) - .withIpam(new Network.Ipam() - .withConfig(new Network.Ipam.Config() - .withSubnet(subnetPrefix + ".0/24"))) - .exec(); + .withName(networkName) + .withIpam(new Network.Ipam() + .withConfig(new Network.Ipam.Config() + .withSubnet(subnetPrefix + ".0/24"))) + .exec(); dockerRule.getClient().connectToNetworkCmd() - .withNetworkId(network.getId()) - .withContainerId(container.getId()) - .withContainerNetwork(new ContainerNetwork() - .withAliases("aliasName" + dockerRule.getKind()) - .withIpamConfig(new ContainerNetwork.Ipam() - .withIpv4Address(containerIp))) - .exec(); + .withNetworkId(network.getId()) + .withContainerId(container.getId()) + .withContainerNetwork(new ContainerNetwork() + .withAliases("aliasName") + .withIpamConfig(new ContainerNetwork.Ipam() + .withIpv4Address(containerIp))) + .exec(); Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec(); @@ -90,7 +89,7 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName); assertNotNull(testNetwork); - assertThat(testNetwork.getAliases(), hasItem("aliasName" + dockerRule.getKind())); + assertThat(testNetwork.getAliases(), hasItem("aliasName")); assertThat(testNetwork.getGateway(), is(subnetPrefix + ".1")); assertThat(testNetwork.getIpAddress(), is(containerIp)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java index bf71b2505..7ff39f3fa 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ChangeLog; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,10 +11,11 @@ import java.util.List; import static ch.lambdaj.Lambda.selectUnique; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -26,10 +26,10 @@ public class ContainerDiffCmdIT extends CmdIT { public void testContainerDiff() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("touch", "/test").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()) + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index ce800d61a..e0c2ca03e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -17,7 +17,7 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; @@ -30,10 +30,10 @@ public class CopyArchiveFromContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveFromContainerCmdIT.class); @Test - public void copyFromContainer() throws Exception { + public void copyFromContainer() { // TODO extract this into a shared method CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("copyFromContainer" + dockerRule.getKind()) + .withName("copyFromContainer") .withCmd("touch", "/copyFromContainer") .exec(); @@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable ); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = TestUtils.asString(response); @@ -53,7 +51,7 @@ public void copyFromContainer() throws Exception { } @Test(expected = NotFoundException.class) - public void copyFromNonExistingContainer() throws Exception { + public void copyFromNonExistingContainer() { dockerRule.getClient().copyArchiveFromContainerCmd("non-existing", "/test").exec(); } @@ -61,14 +59,14 @@ public void copyFromNonExistingContainer() throws Exception { @Test public void copyFromContainerBinaryFile() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("copyFromContainerBinaryFile" + dockerRule.getKind()) + .withName("copyFromContainerBinaryFile") .exec(); LOG.info("Created container: {}", container); assertThat(container.getId(), not(isEmptyOrNullString())); Path temp = Files.createTempFile("", ".tar.gz"); - Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat"); + Path binaryFile = Paths.get(ClassLoader.getSystemResource("testCopyFromArchive/binary.dat").toURI()); CompressArchiveUtil.tar(binaryFile, temp, true, false); try (InputStream uploadStream = Files.newInputStream(temp)) { @@ -76,13 +74,11 @@ public void copyFromContainerBinaryFile() throws Exception { } InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable); try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) { TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry(); - assertEquals(nextTarEntry.getName(), "binary.dat"); + assertEquals("binary.dat", nextTarEntry.getName()); try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) { assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index a061cc5cd..efce65c29 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -3,9 +3,10 @@ import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.core.util.CompressArchiveUtil; +import com.github.dockerjava.utils.LogContainerTestCallback; import org.apache.commons.io.FileUtils; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,12 +16,16 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.concurrent.TimeUnit; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeThat; public class CopyArchiveToContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveToContainerCmdIT.class); @@ -29,7 +34,7 @@ public class CopyArchiveToContainerCmdIT extends CmdIT { public void copyFileToContainer() throws Exception { CreateContainerResponse container = prepareContainerForCopy("1"); Path temp = Files.createTempFile("", ".tar.gz"); - CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false); + CompressArchiveUtil.tar(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()), temp, true, false); try (InputStream uploadStream = Files.newInputStream(temp)) { dockerRule.getClient() .copyArchiveToContainerCmd(container.getId()) @@ -43,7 +48,7 @@ public void copyFileToContainer() throws Exception { public void copyStreamToContainer() throws Exception { CreateContainerResponse container = prepareContainerForCopy("2"); dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) - .withHostResource("src/test/resources/testReadFile") + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()) .exec(); assertFileCopied(container); } @@ -51,8 +56,8 @@ public void copyStreamToContainer() throws Exception { @Test public void copyStreamToContainerTwice() throws Exception { CreateContainerResponse container = prepareContainerForCopy("rerun"); - CopyArchiveToContainerCmd copyArchiveToContainerCmd=dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) - .withHostResource("src/test/resources/testReadFile"); + CopyArchiveToContainerCmd copyArchiveToContainerCmd = dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()); copyArchiveToContainerCmd.exec(); assertFileCopied(container); //run again to make sure no DockerClientException @@ -61,7 +66,7 @@ public void copyStreamToContainerTwice() throws Exception { private CreateContainerResponse prepareContainerForCopy(String method) { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") - .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind()) + .withName("docker-java-itest-copyToContainer" + method) .exec(); LOG.info("Created container: {}", container); assertThat(container.getId(), not(isEmptyOrNullString())); @@ -72,15 +77,15 @@ private CreateContainerResponse prepareContainerForCopy(String method) { private void assertFileCopied(CreateContainerResponse container) throws IOException { try (InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) { - boolean bytesAvailable = response.available() > 0; + boolean bytesAvailable = response.read() != -1; assertTrue( "The file was not copied to the container.", bytesAvailable); } } @Test(expected = NotFoundException.class) public void copyToNonExistingContainer() throws Exception { - - dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec(); + dockerRule.getClient().copyArchiveToContainerCmd("non-existing") + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()).exec(); } @Test @@ -109,7 +114,7 @@ public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{ // cleanup dir FileUtils.deleteDirectory(localDir.toFile()); } - + @Test public void copyFileWithExecutePermission() throws Exception { // create script file, add permission to execute @@ -126,7 +131,7 @@ public void copyFileWithExecutePermission() throws Exception { // script to be copied to the container's home dir and then executes it String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") - .withName("copyFileWithExecutivePerm" + dockerRule.getKind()) + .withName("copyFileWithExecutivePerm") .withCmd("/bin/sh", "-c", containerCmd) .exec(); // start the container @@ -138,10 +143,78 @@ public void copyFileWithExecutePermission() throws Exception { .exec(); // await exid code int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() + .awaitStatusCode(); + // check result + assertThat(exitCode, equalTo(0)); + } + + @Ignore("Docker issue https://github.com/moby/moby/issues/46388") + @Test + public void copyFileWithUIDGID() throws Exception { + Path with = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.with")); + Files.write(with, "with".getBytes()); + + Path without = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.without")); + Files.write(without, "without".getBytes()); + + String containerCmd = "while [ ! -f /home/uidgid.with ]; do true; done && stat -c %n:%u /home/uidgid.with /home/uidgid.without"; + Long syncUserUid = 4L; // sync user in busybox uses uid=4 + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withName("copyFileWithUIDGID") + .withCmd("/bin/sh", "-c", containerCmd) + .withUser(syncUserUid.toString()) + .exec(); + // start the container + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) + .withRemotePath("/home/") + .withHostResource(without.toString()) + .withCopyUIDGID(false) + .exec(); + dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) + .withRemotePath("/home/") + .withHostResource(with.toString()) + .withCopyUIDGID(true) + .exec(); + + // await exit code + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) + .start() .awaitStatusCode(); // check result assertThat(exitCode, equalTo(0)); + + LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true); + + dockerRule.getClient().logContainerCmd(container.getId()) + .withStdOut(true) + .withTailAll() + .exec(loggingCallback); + + loggingCallback.awaitCompletion(3, TimeUnit.SECONDS); + String containerOutput = loggingCallback.toString(); + + assertThat(containerOutput, containsString(String.format("/home/uidgid.with:%d", syncUserUid))); + + Long hostUid = getHostUidIfPossible(); + assumeThat("could not get the uid on host platform", hostUid, notNullValue(Long.class)); + assertThat(containerOutput, containsString(String.format("/home/uidgid.without:%d", hostUid))); } + private static Long getHostUidIfPossible() { + try { + Class unixSystemClazz = Class.forName("com.sun.security.auth.module.UnixSystem"); + Object unixSystem = unixSystemClazz.newInstance(); + Object uid = unixSystemClazz.getMethod("getUid").invoke(unixSystem); + if (uid == null) { + return null; + } + + return uid instanceof Long ? (Long) uid : Long.parseLong(uid.toString()); + } catch (Exception e) { + return null; + } + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java index b2f033cd9..3864aa9e4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java @@ -23,12 +23,12 @@ public class CopyFileFromContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CopyFileFromContainerCmdIT.class); @Test - public void copyFromContainer() throws Exception { + public void copyFromContainer() { assumeThat("Doesn't work since 1.24", dockerRule, not(isGreaterOrEqual(VERSION_1_24))); assumeNotSwarm("", dockerRule); - String containerName = "copyFileFromContainer" + dockerRule.getKind(); + String containerName = "copyFileFromContainer"; dockerRule.ensureContainerRemoved(containerName); // TODO extract this into a shared method @@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); InputStream response = dockerRule.getClient().copyFileFromContainerCmd(container.getId(), "/copyFileFromContainer").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable ); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); @@ -53,7 +51,7 @@ public void copyFromContainer() throws Exception { } @Test(expected = NotFoundException.class) - public void copyFromNonExistingContainer() throws Exception { + public void copyFromNonExistingContainer() { dockerRule.getClient().copyFileFromContainerCmd("non-existing", "/test").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index d0e9c914b..99d5dd997 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -1,17 +1,24 @@ package com.github.dockerjava.cmd; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.CreateVolumeResponse; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.ContainerNetwork; import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DockerObjectAccessor; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.HostConfig; @@ -24,12 +31,14 @@ import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; -import com.github.dockerjava.core.command.LogContainerResultCallback; import com.github.dockerjava.junit.DockerAssume; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import com.github.dockerjava.utils.TestUtils; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; +import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -49,12 +58,12 @@ import static com.github.dockerjava.api.model.Capability.MKNOD; import static com.github.dockerjava.api.model.Capability.NET_ADMIN; import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_44; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; @@ -66,9 +75,10 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; @@ -78,6 +88,9 @@ public class CreateContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateContainerCmdIT.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public TemporaryFolder tempDir = new TemporaryFolder(new File("target/")); @@ -94,7 +107,7 @@ public void createContainerWithExistingName() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("env").withName(containerName).exec(); } @@ -110,7 +123,7 @@ public void createContainerWithVolume() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -133,7 +146,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -218,7 +231,7 @@ public void createContainerWithEnv() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -243,7 +256,7 @@ public void createContainerWithEnvAdditive() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -269,7 +282,7 @@ public void createContainerWithEnvAdditiveMap() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -302,7 +315,7 @@ public void createContainerWithEnvAsVararg() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -326,7 +339,7 @@ public void createContainerWithEnvAsMap() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -347,7 +360,7 @@ public void createContainerWithHostname() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -360,7 +373,7 @@ public void createContainerWithHostname() throws Exception { @Test(expected = ConflictException.class) public void createContainerWithName() throws DockerException { - String containerName = "container_" + dockerRule.getKind(); + String containerName = "container_"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withName(containerName) @@ -368,7 +381,7 @@ public void createContainerWithName() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -382,13 +395,13 @@ public void createContainerWithName() throws DockerException { @Test public void createContainerWithLink() throws DockerException { - String containerName1 = "containerWithlink_" + dockerRule.getKind(); - String containerName2 = "container2Withlink_" + dockerRule.getKind(); + String containerName1 = "containerWithlink_"; + String containerName2 = "container2Withlink_"; CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999") .withName(containerName1).exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -403,7 +416,7 @@ public void createContainerWithLink() throws DockerException { .withLinks(new Link(containerName1, "container1Link"))) .exec(); LOG.info("Created container {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); @@ -412,13 +425,14 @@ public void createContainerWithLink() throws DockerException { } @Test + @Ignore public void createContainerWithMemorySwappiness() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sleep", "9999") .withHostConfig(newHostConfig() .withMemorySwappiness(42L)) .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); LOG.info("Created container {}", container.toString()); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -433,9 +447,9 @@ public void createContainerWithMemorySwappiness() throws DockerException { @Test public void createContainerWithLinkInCustomNetwork() throws DockerException { - String containerName1 = "containerCustomlink_" + dockerRule.getKind(); - String containerName2 = "containerCustom2link_" + dockerRule.getKind(); - String networkName = "linkNetcustom" + dockerRule.getKind(); + String containerName1 = "containerCustomlink_"; + String containerName2 = "containerCustom2link_"; + String networkName = "linkNetcustom"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) @@ -451,7 +465,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { .withName(containerName1) .exec(); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -469,7 +483,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { .exec(); LOG.info("Created container {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); @@ -481,9 +495,9 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { @Test public void createContainerWithCustomIp() throws DockerException { - String containerName1 = "containerCustomIplink_" + dockerRule.getKind(); - String networkName = "customIpNet" + dockerRule.getKind(); - String subnetPrefix = getFactoryType() == JERSEY ? "10.100.104" : "10.100.105"; + String containerName1 = "containerCustomIplink_"; + String networkName = "customIpNet"; + String subnetPrefix = "10.100.101"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withIpam(new Network.Ipam() @@ -503,7 +517,7 @@ public void createContainerWithCustomIp() throws DockerException { .withIpv4Address(subnetPrefix + ".100") .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -519,8 +533,8 @@ public void createContainerWithCustomIp() throws DockerException { @Test public void createContainerWithAlias() throws DockerException { - String containerName1 = "containerAlias_" + dockerRule.getKind(); - String networkName = "aliasNet" + dockerRule.getKind(); + String containerName1 = "containerAlias_"; + String networkName = "aliasNet"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) @@ -534,10 +548,10 @@ public void createContainerWithAlias() throws DockerException { .withNetworkMode(networkName)) .withCmd("sleep", "9999") .withName(containerName1) - .withAliases("server" + dockerRule.getKind()) + .withAliases("server") .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -545,7 +559,7 @@ public void createContainerWithAlias() throws DockerException { .exec(); ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName); - assertThat(aliasNet.getAliases(), hasItem("server" + dockerRule.getKind())); + assertThat(aliasNet.getAliases(), hasItem("server")); } @Test @@ -559,7 +573,7 @@ public void createContainerWithCapAddAndCapDrop() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -581,7 +595,7 @@ public void createContainerWithDns() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -593,12 +607,12 @@ public void createContainerWithDns() throws DockerException { public void createContainerWithEntrypoint() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("containerEntrypoint" + dockerRule.getKind()) + .withName("containerEntrypoint") .withEntrypoint("sleep", "9999").exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -612,13 +626,13 @@ public void createContainerWithExtraHosts() throws DockerException { String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"}; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("containerextrahosts" + dockerRule.getKind()) + .withName("containerextrahosts") .withHostConfig(newHostConfig() .withExtraHosts(extraHosts)).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -636,7 +650,7 @@ public void createContainerWithDevices() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -646,7 +660,7 @@ public void createContainerWithDevices() throws DockerException { @Test public void createContainerWithPortBindings() throws DockerException { - int baseport = getFactoryType() == FactoryType.JERSEY ? 11000 : 12000; + int baseport = 10_000; ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); @@ -664,7 +678,7 @@ public void createContainerWithPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -683,15 +697,15 @@ public void createContainerWithPortBindings() throws DockerException { @Test public void createContainerWithLinking() throws DockerException { - String containerName1 = "containerWithlinking_" + dockerRule.getKind(); - String containerName2 = "container2Withlinking_" + dockerRule.getKind(); + String containerName1 = "containerWithlinking_"; + String containerName2 = "container2Withlinking_"; CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sleep", "9999") .withName(containerName1).exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -700,10 +714,10 @@ public void createContainerWithLinking() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + containerName1)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -718,21 +732,21 @@ public void createContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(containerName1, containerName1 + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + containerName2)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); } @@ -746,7 +760,7 @@ public void createContainerWithRestartPolicy() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -761,7 +775,7 @@ public void createContainerWithPidMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -784,7 +798,7 @@ public void createContainerWithNetworkMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -799,7 +813,7 @@ public void createContainerWithMacAddress() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -808,7 +822,7 @@ public void createContainerWithMacAddress() throws DockerException { @Test public void createContainerWithULimits() throws DockerException { - String containerName = "containerulimit" + dockerRule.getKind(); + String containerName = "containerulimit"; Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)}; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) @@ -819,7 +833,7 @@ public void createContainerWithULimits() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -828,6 +842,28 @@ public void createContainerWithULimits() throws DockerException { } + @Test + public void createContainerWithIntegerBoundsExceedingULimit() throws DockerException { + String containerName = "containercoreulimit"; + Ulimit[] ulimits = {new Ulimit("core", 99999999998L, 99999999999L)}; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withName(containerName) + .withHostConfig(newHostConfig() + .withUlimits(ulimits)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()), + contains(new Ulimit("core", 99999999998L, 99999999999L))); + + } + @Test public void createContainerWithLabels() throws DockerException { @@ -840,7 +876,7 @@ public void createContainerWithLabels() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -865,7 +901,7 @@ public void createContainerWithLogConfig() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -887,7 +923,7 @@ public void testWithStopSignal() throws Exception { .withStopSignal(signal.toString()) .exec(); final String containerId = resp.getId(); - assertThat(containerId, not(isEmptyString())); + assertThat(containerId, not(is(emptyString()))); dockerRule.getClient().startContainerCmd(containerId).exec(); InspectContainerResponse inspect = dockerRule.getClient().inspectContainerCmd(containerId).exec(); @@ -910,10 +946,10 @@ public void testWithStopSignal() throws Exception { .awaitCompletion(); String log = callback.builder.toString(); - assertThat(log, is("exit trapped 10")); + assertThat(log.trim(), is("exit trapped 10")); } - private static class StringBuilderLogReader extends LogContainerResultCallback { + private static class StringBuilderLogReader extends ResultCallback.Adapter { public StringBuilder builder; public StringBuilderLogReader(StringBuilder builder) { @@ -922,13 +958,15 @@ public StringBuilderLogReader(StringBuilder builder) { @Override public void onNext(Frame item) { - builder.append(new String(item.getPayload()).trim()); + builder.append(new String(item.getPayload())); super.onNext(item); } } @Test public void createContainerWithCgroupParent() throws DockerException { + assumeThat(!SystemUtils.IS_OS_LINUX, is(true)); + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") .withHostConfig(newHostConfig() .withCgroupParent("/parent")) @@ -936,7 +974,7 @@ public void createContainerWithCgroupParent() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainer = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -952,7 +990,7 @@ public void createContainerWithShmSize() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -970,7 +1008,7 @@ public void createContainerWithShmPidsLimit() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -1003,9 +1041,9 @@ public void createContainerWithNetworkID() { public void createContainerFromPrivateRegistryWithValidAuth() throws Exception { DockerAssume.assumeSwarm(dockerRule.getClient()); - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("create-container-with-valid-auth"); CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imgName) .withAuthConfig(authConfig) @@ -1016,9 +1054,9 @@ public void createContainerFromPrivateRegistryWithValidAuth() throws Exception { @Test public void createContainerFromPrivateRegistryWithNoAuth() throws Exception { - RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-no-auth"); + String imgName = REGISTRY.createPrivateImage("create-container-with-no-auth"); if (TestUtils.isSwarm(dockerRule.getClient())) { exception.expect(instanceOf(InternalServerErrorException.class)); @@ -1035,9 +1073,104 @@ public void createContainerWithTmpFs() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999") .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m")); } + + @Test + public void createContainerWithNanoCPUs() throws DockerException { + Long nanoCPUs = 1000000000L; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withNanoCPUs(nanoCPUs)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); + } + + @Test + public void overrideHostConfigWithRawValues() { + HostConfig hostConfig = new HostConfig() + .withNanoCPUs(1_000_000_000L); + + DockerObjectAccessor.overrideRawValue( + hostConfig, + "NanoCPUs", + 500_000_000L + ); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(hostConfig) + .exec(); + + LOG.info("Created container {}", container.toString()); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(500_000_000L)); + } + + @Test + public void shouldNotEncodeAuth() { + CreateContainerCmd cmd = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withAuthConfig(new AuthConfig().withEmail("test@test.com")) + .withCmd("sleep", "9999"); + + ObjectMapper objectMapper = dockerRule.getConfig().getObjectMapper(); + + ObjectNode jsonNode = objectMapper.valueToTree(cmd); + + assertThat(jsonNode.get("authConfig"), nullValue()); + } + + @Test + public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() { + // Should not throw + dockerRule.getClient() + .createContainerCmd(DEFAULT_IMAGE) + .withAliases("hello-world") + .withHostConfig(newHostConfig()) + .withCmd("sleep", "9999") + .exec(); + } + + @Test + public void createContainerWithAnnotations() throws DockerException { + DefaultDockerClientConfig forcedConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(VERSION_1_44) + .withRegistryUrl("https://index.docker.io/v1/") + .build(); + + DockerClient forcedClient = CmdIT.createDockerClient(forcedConfig); + Map annotations = new HashMap<>(); + annotations.put("com.example.key1", "value1"); + annotations.put("com.example.key2", "value2"); + + CreateContainerResponse container = forcedClient.createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withAnnotations(annotations)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = forcedClient.inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getAnnotations(), equalTo(annotations)); + assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key1"), equalTo("value1")); + assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key2"), equalTo("value2")); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index a4d251c32..d60425a2a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -15,9 +15,11 @@ import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeThat; @@ -28,7 +30,7 @@ public class CreateNetworkCmdIT extends CmdIT { public void createNetwork() throws DockerException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "createNetwork" + dockerRule.getKind(); + String networkName = "createNetwork"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).exec(); @@ -37,14 +39,15 @@ public void createNetwork() throws DockerException { Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); assertThat(network.getName(), is(networkName)); assertThat(network.getDriver(), is("bridge")); + assertThat(network.getCreated().getTime(), greaterThan(0L)); } @Test public void createNetworkWithIpamConfig() throws DockerException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "networkIpam" + dockerRule.getKind(); - String subnet = getFactoryType() == FactoryType.JERSEY ? "10.67.79.0/24" : "10.67.90.0/24"; + String networkName = "networkIpam"; + String subnet = "10.67.79.0/24"; Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet)); CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec(); @@ -52,7 +55,7 @@ public void createNetworkWithIpamConfig() throws DockerException { assertNotNull(createNetworkResponse.getId()); Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); - assertEquals(network.getName(), networkName); + assertEquals(networkName, network.getName()); assertEquals("bridge", network.getDriver()); assertEquals(subnet, network.getIpam().getConfig().iterator().next().getSubnet()); } @@ -61,7 +64,7 @@ public void createNetworkWithIpamConfig() throws DockerException { public void createAttachableNetwork() throws DockerException { assumeThat("API version should be > 1.24", dockerRule, isGreaterOrEqual(VERSION_1_25)); - String networkName = "createAttachableNetwork" + dockerRule.getKind(); + String networkName = "createAttachableNetwork"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) .withAttachable(true) @@ -77,12 +80,12 @@ public void createNetworkWithLabel() throws DockerException { assumeNotSwarm("no network in swarm?", dockerRule); assumeThat("API version should be >= 1.21", dockerRule, isGreaterOrEqual(VERSION_1_21)); - String networkName = "createNetworkWithLabel" + dockerRule.getKind(); + String networkName = "createNetworkWithLabel"; Map labels = new HashMap<>(); - labels.put("com.example.usage" + dockerRule.getKind(), "test"); + labels.put("com.example.usage", "test"); CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec(); assertNotNull(createNetworkResponse.getId()); Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); - assertEquals(network.getLabels(), labels); + assertEquals(labels, network.getLabels()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java index 951b1ed6d..f59907afa 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java @@ -4,6 +4,8 @@ import com.github.dockerjava.api.exception.DockerException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,10 +18,11 @@ public void createVolume() throws DockerException { String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo(volumeName)); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/")); } @@ -29,17 +32,19 @@ public void createVolumeWithExistingName() throws DockerException { String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse1 = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse1.getName(), equalTo(volumeName)); assertThat(createVolumeResponse1.getDriver(), equalTo("local")); + assertThat(createVolumeResponse1.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/")); CreateVolumeResponse createVolumeResponse2 = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse2.getName(), equalTo(volumeName)); assertThat(createVolumeResponse2.getDriver(), equalTo("local")); + assertThat(createVolumeResponse2.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint())); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java new file mode 100644 index 000000000..bf273a98c --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.core.DockerRule; +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient.Request; +import com.github.dockerjava.transport.DockerHttpClient.Response; +import org.apache.commons.io.IOUtils; +import org.junit.Assume; +import org.junit.Test; + +import java.nio.charset.StandardCharsets; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class CustomCommandIT extends CmdIT { + + @Test + public void testCustomCommand() throws Exception { + DockerHttpClient httpClient = CmdIT.createDockerHttpClient(DockerRule.config(null)); + + Assume.assumeNotNull(httpClient); + + Request request = Request.builder() + .method(Request.Method.GET) + .path("/_ping") + .build(); + + try (Response response = httpClient.execute(request)) { + assertThat(response.getStatusCode(), equalTo(200)); + assertThat(IOUtils.toString(response.getBody(), StandardCharsets.UTF_8), equalTo("OK")); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java index 3c9451545..2d932cc24 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java @@ -13,13 +13,13 @@ public class DisconnectFromNetworkCmdIT extends CmdIT { @Test - public void disconnectFromNetwork() throws InterruptedException { + public void disconnectFromNetwork() { assumeNotSwarm("no network in swarm", dockerRule); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork" + dockerRule.getKind()).exec(); + CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork").exec(); dockerRule.getClient().connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec(); @@ -35,14 +35,14 @@ public void disconnectFromNetwork() throws InterruptedException { } @Test - public void forceDisconnectFromNetwork() throws InterruptedException { + public void forceDisconnectFromNetwork() { assumeNotSwarm("no network in swarm", dockerRule); - CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec(); + CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2").exec(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") .withHostConfig(newHostConfig() - .withNetworkMode("testNetwork2" + dockerRule.getKind())) + .withNetworkMode("testNetwork2")) .withCmd("sleep", "9999") .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java new file mode 100644 index 000000000..1da12f3e0 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.cmd; + +import org.junit.rules.ExternalResource; + +public class DockerHttpClientLeakDetector extends ExternalResource { + + @Override + protected void before() { + synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) { + TrackingDockerHttpClient.ACTIVE_RESPONSES.clear(); + } + } + + @Override + protected void after() { + synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) { + if (TrackingDockerHttpClient.ACTIVE_RESPONSES.isEmpty()) { + return; + } + + System.out.println("Leaked responses:"); + IllegalStateException exception = new IllegalStateException("Leaked responses!"); + exception.setStackTrace(new StackTraceElement[0]); + + TrackingDockerHttpClient.ACTIVE_RESPONSES.forEach(response -> { + exception.addSuppressed(response.allocatedAt); + }); + throw exception; + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java index 89a186c54..2a16e5474 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java @@ -1,9 +1,9 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Event; -import com.github.dockerjava.core.command.EventsResultCallback; -import com.github.dockerjava.core.command.PullImageResultCallback; +import com.github.dockerjava.api.model.EventType; import com.github.dockerjava.utils.TestUtils; import org.junit.Test; import org.slf4j.Logger; @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -114,13 +115,44 @@ public void testEventStreamingWithFilter() throws Exception { } } + @Test + public void testEventStreamingWithEventTypeFilter() throws Exception { + assumeNotSwarm("", dockerRule); + + String startTime = getEpochTime(); + generateEvents(); + String endTime = getEpochTime(); + + for (EventType eventType : EventType.values()) { + List events = new CopyOnWriteArrayList<>(); + try ( + ResultCallback.Adapter eventCallback = dockerRule.getClient().eventsCmd() + .withSince(startTime) + .withUntil(endTime) + .withEventTypeFilter(eventType) + .exec(new ResultCallback.Adapter() { + @Override + public void onNext(Event event) { + events.add(event); + } + }) + ) { + eventCallback.awaitCompletion(30, TimeUnit.SECONDS); + + for (Event event : events) { + assertThat("Received event: " + event, event.getType(), is(eventType)); + } + } + } + } + /** * This method generates some events and returns the number of events being generated */ private int generateEvents() throws Exception { String testImage = "busybox:latest"; - dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess(); + dockerRule.getClient().pullImageCmd(testImage).start().awaitCompletion(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd(testImage).withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); dockerRule.getClient().stopContainerCmd(container.getId()).withTimeout(1).exec(); @@ -136,7 +168,7 @@ private int generateEvents() throws Exception { return 5; } - private class EventsTestCallback extends EventsResultCallback { + private class EventsTestCallback extends ResultCallback.Adapter { private final CountDownLatch countDownLatch; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java index 7b7d63c1c..2f18d7e85 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java @@ -8,9 +8,10 @@ import java.security.SecureRandom; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class ExecCreateCmdImplIT extends CmdIT { @@ -26,13 +27,13 @@ public void execCreateTest() { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId()) .withCmd("touch", "file.log").exec(); - assertThat(execCreateCmdResponse.getId(), not(isEmptyString())); + assertThat(execCreateCmdResponse.getId(), not(is(emptyString()))); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java index feec37155..fc111f0e2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java @@ -4,6 +4,7 @@ import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.core.command.ExecStartResultCallback; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,8 +14,9 @@ import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; import static com.github.dockerjava.utils.TestUtils.asString; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -31,7 +33,7 @@ public void execStart() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -45,8 +47,6 @@ public void execStart() throws Exception { .awaitCompletion(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); @@ -61,7 +61,7 @@ public void execStartAttached() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -71,8 +71,6 @@ public void execStartAttached() throws Exception { .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue( "The file was not copied from the container.", bytesAvailable); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); @@ -80,6 +78,7 @@ public void execStartAttached() throws Exception { assertTrue(responseAsString.length() > 0); } + @Ignore @Test(expected = NotFoundException.class) public void execStartWithNonExistentUser() throws Exception { String containerName = "generated_" + new SecureRandom().nextInt(); @@ -87,7 +86,7 @@ public void execStartWithNonExistentUser() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java new file mode 100644 index 000000000..8e4712d84 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java @@ -0,0 +1,52 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; + +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.emptyString; + +public class ExportContainerCmdIT extends CmdIT { + + private static final Logger LOG = LoggerFactory.getLogger(ExportContainerCmdIT.class); + + @Test + public void exportContainerHasCreatedFile() throws Exception { + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("touch", "/myExportedFile") + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() + .awaitStatusCode(); + assertThat(exitCode, is(0)); + + try (InputStream response = dockerRule.getClient().exportContainerCmd(container.getId()).exec()) { + boolean foundFile = false; + try (TarArchiveInputStream tarStream = new TarArchiveInputStream(response)) { + TarArchiveEntry entry; + while ((entry = tarStream.getNextTarEntry()) != null) { + if (entry.getName().contains("myExportedFile")) { + foundFile = true; + break; + } + } + } + assertThat("Exported archive should contain the created file", foundFile, is(true)); + } + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java new file mode 100644 index 000000000..bdca27572 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java @@ -0,0 +1,88 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.HealthStateLog; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.model.HealthCheck; +import com.github.dockerjava.core.RemoteApiVersion; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assume.assumeThat; + +public class HealthCmdIT extends CmdIT { + private final Logger LOG = LoggerFactory.getLogger(HealthCmdIT.class); + + @Test + public void healthiness() { + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("nc", "-l", "-p", "8080") + .withHealthcheck(new HealthCheck() + .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080")) + .withInterval(TimeUnit.SECONDS.toNanos(1)) + .withTimeout(TimeUnit.MINUTES.toNanos(1)) + .withStartPeriod(TimeUnit.SECONDS.toNanos(30)) + .withRetries(10)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + await().atMost(60L, TimeUnit.SECONDS).untilAsserted( + () -> { + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + assertThat(inspectContainerResponse.getState().getHealth().getStatus(), is(equalTo("healthy"))); + } + ); + } + + @Test + public void healthiness_startInterval() { + assumeThat("API version should be >= 1.44", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_44)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("nc", "-l", "-p", "8080") + .withHealthcheck(new HealthCheck() + .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080")) + .withInterval(TimeUnit.SECONDS.toNanos(5)) + .withTimeout(TimeUnit.MINUTES.toNanos(1)) + .withStartPeriod(TimeUnit.SECONDS.toNanos(2)) + .withStartInterval(TimeUnit.SECONDS.toNanos(1)) + .withRetries(10)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + await().atMost(60L, TimeUnit.SECONDS).untilAsserted( + () -> { + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + List healthStateLogs = inspectContainerResponse.getState().getHealth().getLog(); + assertThat(healthStateLogs.size(), is(greaterThanOrEqualTo(2))); + healthStateLogs.forEach(log -> LOG.info("Health log: {}", log.getStart())); + HealthStateLog log1 = healthStateLogs.get(healthStateLogs.size() - 1); + HealthStateLog log2 = healthStateLogs.get(healthStateLogs.size() - 2); + long diff = ChronoUnit.NANOS.between(ZonedDateTime.parse(log2.getStart()), ZonedDateTime.parse(log1.getStart())); + assertThat(diff, is(greaterThanOrEqualTo(inspectContainerResponse.getConfig().getHealthcheck().getInterval()))); + } + ); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java new file mode 100644 index 000000000..16ae7e6a2 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java @@ -0,0 +1,29 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.model.ImageHistory; +import org.junit.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.notNullValue; + +public class ImageHistoryCmdIT extends CmdIT { + + @Test + public void imageHistory() { + List history = dockerRule.getClient().imageHistoryCmd("busybox").exec(); + + assertThat(history, notNullValue()); + assertThat(history, hasSize(greaterThan(0))); + + ImageHistory entry = history.get(0); + assertThat(entry.getId(), notNullValue()); + assertThat(entry.getCreated(), notNullValue()); + assertThat(entry.getCreatedBy(), notNullValue()); + assertThat(entry.getSize(), notNullValue()); + assertThat(entry.getComment(), notNullValue()); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java index b4f70fe19..74fc2cbda 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java @@ -8,7 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -48,6 +48,7 @@ public void infoTest() throws DockerException { assertThat(dockerInfo.getImages(), notNullValue()); assertThat(dockerInfo.getImages(), greaterThan(0)); assertThat(dockerInfo.getDebug(), notNullValue()); + assertThat(dockerInfo.getRuntimes(), notNullValue()); if (isNotSwarm(dockerClient)) { assertThat(dockerInfo.getNFd(), greaterThan(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 75649bf2b..e47a911d7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -6,6 +6,7 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Container; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +22,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -42,10 +43,10 @@ public void inspectContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); - assertEquals(containerInfo.getId(), container.getId()); + assertEquals(container.getId(), containerInfo.getId()); } @@ -90,7 +91,7 @@ public void inspectContainerWithSize() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerCmd command = dockerRule.getClient().inspectContainerCmd(container.getId()).withSize(true); assertTrue(command.getSize()); @@ -100,7 +101,9 @@ public void inspectContainerWithSize() throws DockerException { // TODO check swarm if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); - assertTrue(containerInfo.getSizeRootFs().intValue() > 0); + assertTrue(containerInfo.getSizeRootFs() > 0L); + assertNotNull(containerInfo.getSizeRw()); + assertEquals(4096, containerInfo.getSizeRw().longValue()); } } @@ -117,7 +120,7 @@ public void inspectContainerRestartCount() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -125,6 +128,7 @@ public void inspectContainerRestartCount() throws DockerException { } @Test + @Ignore public void inspectContainerNetworkSettings() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") @@ -132,10 +136,25 @@ public void inspectContainerNetworkSettings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode()); } + + @Test + public void inspectContainerNanoCPUs() throws DockerException { + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("env").exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(0L)); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java index 3eecd3c33..b256c6a7c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java @@ -17,8 +17,8 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.utils.TestUtils.getVersion; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -35,7 +35,7 @@ public void inspectExec() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -43,7 +43,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse checkFileExec1 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("test", "-e", "/marker").exec(); LOG.info("Created exec {}", checkFileExec1.toString()); - assertThat(checkFileExec1.getId(), not(isEmptyString())); + assertThat(checkFileExec1.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(checkFileExec1.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse first = dockerRule.getClient().inspectExecCmd(checkFileExec1.getId()).exec(); @@ -54,7 +54,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse touchFileExec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("touch", "/marker").exec(); LOG.info("Created exec {}", touchFileExec.toString()); - assertThat(touchFileExec.getId(), not(isEmptyString())); + assertThat(touchFileExec.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(touchFileExec.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse second = dockerRule.getClient().inspectExecCmd(touchFileExec.getId()).exec(); @@ -65,7 +65,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse checkFileExec2 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("test", "-e", "/marker").exec(); LOG.info("Created exec {}", checkFileExec2.toString()); - assertThat(checkFileExec2.getId(), not(isEmptyString())); + assertThat(checkFileExec2.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(checkFileExec2.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse third = dockerRule.getClient().inspectExecCmd(checkFileExec2.getId()).exec(); @@ -79,7 +79,7 @@ public void inspectExec() throws Exception { } @Test - public void inspectExecNetworkSettings() throws IOException { + public void inspectExecNetworkSettings() { final RemoteApiVersion apiVersion = getVersion(dockerRule.getClient()); String containerName = "generated_" + new SecureRandom().nextInt(); @@ -87,14 +87,14 @@ public void inspectExecNetworkSettings() throws IOException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); ExecCreateCmdResponse exec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("/bin/bash").exec(); LOG.info("Created exec {}", exec.toString()); - assertThat(exec.getId(), not(isEmptyString())); + assertThat(exec.getId(), not(is(emptyString()))); InspectExecResponse inspectExecResponse = dockerRule.getClient().inspectExecCmd(exec.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java index eca86497d..035d3d767 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java @@ -10,6 +10,7 @@ import static com.github.dockerjava.utils.TestUtils.findNetwork; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; public class InspectNetworkCmdIT extends CmdIT { @@ -28,5 +29,6 @@ public void inspectNetwork() throws DockerException { assertThat(network.getDriver(), equalTo(expected.getDriver())); assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet())); assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver())); + assertThat(network.getCreated().getTime(), greaterThan(0L)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java index 20e56dceb..2e9b806b2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.NotFoundException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,12 +18,14 @@ public void inspectVolume() throws DockerException { String volumeName = "volume1"; - dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local").exec(); + dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local") + .withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); InspectVolumeResponse inspectVolumeResponse = dockerRule.getClient().inspectVolumeCmd(volumeName).exec(); assertThat(inspectVolumeResponse.getName(), equalTo("volume1")); assertThat(inspectVolumeResponse.getDriver(), equalTo("local")); + assertThat(inspectVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/")); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java index c79c6992b..617e547cb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class KillContainerCmdIT extends CmdIT { @@ -22,7 +22,7 @@ public void killContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Killing container: {}", container.getId()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index 50ba4ca40..3490924c7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -5,8 +5,6 @@ import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Volume; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.junit.DockerAssume; import org.hamcrest.Matcher; import org.junit.After; @@ -19,6 +17,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.TimeUnit; import static ch.lambdaj.Lambda.filter; import static com.github.dockerjava.api.model.HostConfig.newHostConfig; @@ -27,11 +26,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; -import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.oneOf; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.testinfected.hamcrest.jpa.PersistenceMatchers.hasField; @@ -61,7 +61,7 @@ public void tearDown() { } @Test - public void testListContainers() throws Exception { + public void testListContainers() { List containers = dockerRule.getClient().listContainersCmd() .withLabelFilter(testLabel) .withShowAll(true) @@ -75,7 +75,7 @@ public void testListContainers() throws Exception { .withLabels(testLabel) .withCmd("echo") .exec(); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec(); assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(DEFAULT_IMAGE))); @@ -103,12 +103,12 @@ public void testListContainers() throws Exception { } Container container2 = filteredContainers.get(0); - assertThat(container2.getCommand(), not(isEmptyString())); + assertThat(container2.getCommand(), not(is(emptyString()))); assertThat(container2.getImage(), startsWith(DEFAULT_IMAGE)); } @Test - public void testListContainersWithLabelsFilter() throws Exception { + public void testListContainersWithLabelsFilter() { // list with filter by Map label dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("echo") .withLabels(testLabel) @@ -122,7 +122,7 @@ public void testListContainersWithLabelsFilter() throws Exception { assertThat(filteredContainersByMap.size(), is(1)); Container container3 = filteredContainersByMap.get(0); - assertThat(container3.getCommand(), not(isEmptyString())); + assertThat(container3.getCommand(), not(is(emptyString()))); assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE)); // List by string label @@ -134,13 +134,13 @@ public void testListContainersWithLabelsFilter() throws Exception { assertThat(filteredContainers.size(), is(1)); container3 = filteredContainers.get(0); - assertThat(container3.getCommand(), not(isEmptyString())); + assertThat(container3.getCommand(), not(is(emptyString()))); assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE)); assertEquals(testLabel.get("test"), container3.getLabels().get("test")); } @Test - public void testNameFilter() throws Exception { + public void testNameFilter() { String testUUID = testLabel.get("test"); String id1, id2; @@ -162,12 +162,12 @@ public void testNameFilter() throws Exception { .exec(); assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2))); + assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2))); } @Test - public void testIdsFilter() throws Exception { + public void testIdsFilter() { String id1, id2; id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) @@ -185,21 +185,13 @@ public void testIdsFilter() throws Exception { .exec(); assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2))); + assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2))); } @Test - public void testStatusFilter() throws Exception { - String id1, id2; - id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sh", "-c", "sleep 99999") - .withLabels(testLabel) - .exec() - .getId(); - - id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sh", "-c", "sleep 99999") + public void shouldFilterByCreatedStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) .exec() .getId(); @@ -210,46 +202,71 @@ public void testStatusFilter() throws Exception { .withStatusFilter(singletonList("created")) .exec(); - assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().startContainerCmd(id1).exec(); + @Test + public void shouldFilterByRunningStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("running")) .exec(); - assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers, hasSize(1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().pauseContainerCmd(id1).exec(); + @Test + public void shouldFilterByPausedStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sh", "-c", "sleep 99999") + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); + dockerRule.getClient().pauseContainerCmd(containerId).exec(); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("paused")) .exec(); - assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers, hasSize(1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().unpauseContainerCmd(id1).exec(); - dockerRule.getClient().stopContainerCmd(id1).exec(); + @Test + public void shouldFilterByExitedStatus() throws InterruptedException { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sh", "-c", "sleep 99999") + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); + dockerRule.getClient().stopContainerCmd(containerId).exec(); + dockerRule.getClient().waitContainerCmd(containerId).start().awaitCompletion(15, TimeUnit.SECONDS); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("exited")) .exec(); - assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers, hasSize(1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); } @Test - public void testVolumeFilter() throws Exception { + public void testVolumeFilter() { String id; dockerRule.getClient().createVolumeCmd() .withName("TestFilterVolume") @@ -273,12 +290,12 @@ public void testVolumeFilter() throws Exception { .withVolumeFilter(singletonList("TestFilterVolume")) .exec(); - assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers, hasSize(1)); assertThat(filteredContainers.get(0).getId(), is(id)); } @Test - public void testNetworkFilter() throws Exception { + public void testNetworkFilter() { String id; dockerRule.getClient().createNetworkCmd() .withName("TestFilterNetwork") @@ -313,11 +330,11 @@ public void testAncestorFilter() throws Exception { DockerAssume.assumeNotSwarm(dockerRule.getClient()); dockerRule.getClient().pullImageCmd("busybox") - .withTag("1.24") - .exec(new PullImageResultCallback()) + .withTag("1.35") + .start() .awaitCompletion(); - dockerRule.getClient().createContainerCmd("busybox:1.24") + dockerRule.getClient().createContainerCmd("busybox:1.35") .withLabels(testLabel) .exec(); @@ -339,7 +356,7 @@ public void testAncestorFilter() throws Exception { } @Test - public void testExitedFilter() throws Exception { + public void testExitedFilter() { dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) .exec(); @@ -352,7 +369,7 @@ public void testExitedFilter() throws Exception { dockerRule.getClient().startContainerCmd(id).exec(); - Integer status = dockerRule.getClient().waitContainerCmd(id).exec(new WaitContainerResultCallback()) + Integer status = dockerRule.getClient().waitContainerCmd(id).start() .awaitStatusCode(); assertThat(status, is(42)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java index 73a715900..67ba85672 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java @@ -4,10 +4,12 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.api.model.Info; +import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; import java.util.List; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; @@ -15,8 +17,9 @@ import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertTrue; @@ -37,9 +40,9 @@ public void listImages() throws DockerException { Image img = images.get(0); assertThat(img.getCreated(), is(greaterThan(0L))); - assertThat(img.getVirtualSize(), is(greaterThan(0L))); - assertThat(img.getId(), not(isEmptyString())); - assertThat(img.getRepoTags(), not(emptyArray())); + assertThat(img.getSize(), is(greaterThan(0L))); + assertThat(img.getId(), not(is(emptyString()))); + assertThat(img.getRepoTags(), emptyArray()); } @Test @@ -54,6 +57,36 @@ public void listImagesWithDanglingFilter() throws DockerException { assertTrue(imageInFilteredList); } + @Test + public void listImagesWithReferenceFilter() throws DockerException { + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); + + dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); + try { + List images = dockerRule.getClient().listImagesCmd().withReferenceFilter("docker-java/busybox") + .exec(); + assertThat(images, hasSize(1)); + } + finally { + dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec(); + } + } + + @Test + public void listImagesWithFilter() throws DockerException { + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); + + dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); + try { + List images = dockerRule.getClient().listImagesCmd().withFilter("reference", Collections.singletonList("docker-java/busybox")) + .exec(); + assertThat(images, hasSize(1)); + } + finally { + dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec(); + } + } + private boolean isImageInFilteredList(List images, String expectedImageId) { for (Image image : images) { if (expectedImageId.equals(image.getId())) { @@ -66,7 +99,7 @@ private boolean isImageInFilteredList(List images, String expectedImageId private String createDanglingImage() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container {}", container.toString()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java index a54ae33da..df073e16d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.DockerException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,10 +18,11 @@ public class ListVolumesCmdIT extends CmdIT { public void listVolumes() throws DockerException { CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName("volume1") - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo("volume1")); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/")); ListVolumesResponse listVolumesResponse = dockerRule.getClient().listVolumesCmd().exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java index 5734163f9..36a8d51fc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.command.LoadImageCallback; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.utils.TestResources; import net.jcip.annotations.NotThreadSafe; @@ -24,7 +25,7 @@ public class LoadImageCmdIT extends CmdIT { @Before public void beforeMethod() { - expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba"; + expectedImageId = "sha256:28a8ed28c8b7bd9d7fc00f22ac7df6d385436b93e88ac978943f3dba06d836b4"; if (findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()) != null) { dockerRule.getClient().removeImageCmd(expectedImageId).exec(); } @@ -53,6 +54,19 @@ public void loadImageFromTar() throws Exception { asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0"))); } + @Test + public void loadImageFromTarAsync() throws Exception { + try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) { + dockerRule.getClient().loadImageAsyncCmd(uploadStream).exec(new LoadImageCallback()).awaitMessage(); + } + + final Image image = findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()); + + assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue()); + assertThat("Image after loading from a tar archive has wrong tags!", + asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0"))); + } + private Image findImageWithId(final String id, final List images) { for (Image image : images) { if (id.equals(image.getId())) { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index db0700ecc..8593d6ccf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -1,21 +1,36 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.LongStream; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.CoreMatchers.everyItem; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,7 +47,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()) .exec(); @@ -51,7 +66,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception { assertTrue(loggingCallback.toString().contains("hello")); - assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW); + assertEquals(StreamType.RAW, loggingCallback.getCollectedFrames().get(0).getStreamType()); } @Test @@ -63,7 +78,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()) .exec(); @@ -82,7 +97,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception { assertTrue(loggingCallback.toString().contains("hello")); - assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT); + assertEquals(StreamType.STDOUT, loggingCallback.getCollectedFrames().get(0).getStreamType()); } @Test @@ -92,7 +107,7 @@ public void asyncLogNonExistingContainer() throws Exception { @Override public void onError(Throwable throwable) { - assertEquals(throwable.getClass().getName(), NotFoundException.class.getName()); + assertEquals(NotFoundException.class.getName(), throwable.getClass().getName()); try { // close the callback to prevent the call to onComplete @@ -124,12 +139,12 @@ public void asyncMultipleLogContainer() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); @@ -173,14 +188,14 @@ public void asyncLogContainerWithSince() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); int timestamp = (int) (System.currentTimeMillis() / 1000); dockerRule.getClient().startContainerCmd(container.getId()).exec(); int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); @@ -191,10 +206,59 @@ public void asyncLogContainerWithSince() throws Exception { .withStdErr(true) .withStdOut(true) .withSince(timestamp) + .withUntil(timestamp + 1000) .exec(loggingCallback); loggingCallback.awaitCompletion(); assertThat(loggingCallback.toString(), containsString(snippet)); } + + @Test(timeout = 10_000) + public void simultaneousCommands() throws Exception { + // Create a new client to not affect other tests + DockerClient client = dockerRule.newClient(); + CreateContainerResponse container = client.createContainerCmd("busybox") + .withCmd("/bin/sh", "-c", "echo hello world; sleep infinity") + .exec(); + + client.startContainerCmd(container.getId()).exec(); + + // Simulate 100 simultaneous connections + int connections = 100; + + ExecutorService executor = Executors.newFixedThreadPool(connections); + try { + List firstFrames = new CopyOnWriteArrayList<>(); + executor.invokeAll( + LongStream.range(0, connections).>mapToObj(__ -> { + return () -> { + return client.logContainerCmd(container.getId()) + .withStdOut(true) + .withFollowStream(true) + .exec(new ResultCallback.Adapter() { + + final AtomicBoolean first = new AtomicBoolean(true); + + @Override + public void onNext(Frame object) { + if (first.compareAndSet(true, false)) { + firstFrames.add(object); + } + super.onNext(object); + } + }); + }; + }).collect(Collectors.toList()) + ); + + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + assertThat(firstFrames, hasSize(connections)); + }); + + assertThat(firstFrames, everyItem(hasToString("STDOUT: hello world"))); + } finally { + executor.shutdownNow(); + } + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java index 528160951..3647e713a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class PauseCmdIT extends CmdIT { @@ -20,7 +21,7 @@ public void pauseRunningContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -38,7 +39,7 @@ public void pauseStoppedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -52,7 +53,7 @@ public void pausePausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -66,7 +67,7 @@ public void pauseCreatedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().pauseContainerCmd(container.getId()).exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java index 73ba598ff..3b8dde3ff 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java @@ -2,13 +2,13 @@ import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.exception.DockerClientException; -import com.github.dockerjava.api.exception.InternalServerErrorException; +import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.core.RemoteApiVersion; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -26,6 +26,9 @@ public class PullImageCmdIT extends CmdIT { private static final Logger LOG = LoggerFactory.getLogger(PullImageCmdIT.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public ExpectedException exception = ExpectedException.none(); @@ -42,7 +45,7 @@ public void testPullImage() throws Exception { // pulled down, preferably small in size. If tag is not used pull will // download all images in that repository but tmpImgs will only // deleted 'latest' image but not images with other tags - String testImage = "hackmann/empty"; + String testImage = "alpine:3.17"; LOG.info("Removing image: {}", testImage); @@ -61,7 +64,7 @@ public void testPullImage() throws Exception { LOG.info("Pulling image: {}", testImage); dockerRule.getClient().pullImageCmd(testImage) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); info = dockerRule.getClient().infoCmd().exec(); @@ -85,80 +88,78 @@ public void testPullNonExistingImage() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd("xvxcv/foo") - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @Test public void testPullImageWithValidAuth() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @Test public void testPullImageWithValidAuthAndEmail() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()) - .withEmail("foo@bar.de"); + AuthConfig authConfig = REGISTRY.getAuthConfig().withEmail("foo@bar.de"); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @Test public void testPullImageWithNoAuth() throws Exception { - RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-no-auth"); if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { - exception.expect(InternalServerErrorException.class); + exception.expect(DockerException.class); } else { exception.expect(DockerClientException.class); } // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @Test public void testPullImageWithInvalidAuth() throws Exception { - AuthConfig validAuthConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); - - AuthConfig authConfig = new AuthConfig() + AuthConfig authConfig = REGISTRY.getAuthConfig(); + AuthConfig invalidAuthConfig = new AuthConfig() .withUsername("testuser") .withPassword("testwrongpassword") .withEmail("foo@bar.de") - .withRegistryAddress(validAuthConfig.getRegistryAddress()); + .withRegistryAddress(authConfig.getRegistryAddress()); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-invalid-auth"); if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { - exception.expect(InternalServerErrorException.class); + exception.expect(DockerException.class); } else { exception.expect(DockerClientException.class); } // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) - .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .withAuthConfig(invalidAuthConfig) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index 82f2dda37..00cd11d51 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -5,38 +5,39 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.core.RemoteApiVersion; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.UUID; import java.util.concurrent.TimeUnit; import static com.github.dockerjava.utils.TestUtils.getVersion; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class PushImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdIT.class); - private String username; + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); @Rule public ExpectedException exception = ExpectedException.none(); private AuthConfig authConfig; @Before - public void beforeTest() throws Exception { - username = dockerRule.getClient().authConfig().getUsername(); - authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + public void beforeTest() { + authConfig = REGISTRY.getAuthConfig(); } @Test @@ -44,10 +45,10 @@ public void pushLatest() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); LOG.info("Committing container: {}", container.toString()); - String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest"; + String imgName = authConfig.getRegistryAddress() + "/push-latest"; String imageId = dockerRule.getClient().commitCmd(container.getId()) .withRepository(imgName) .exec(); @@ -55,7 +56,7 @@ public void pushLatest() throws Exception { // we have to block until image is pushed dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); LOG.info("Removing image: {}", imageId); @@ -64,7 +65,7 @@ public void pushLatest() throws Exception { dockerRule.getClient().pullImageCmd(imgName) .withTag("latest") .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -78,32 +79,32 @@ public void pushNonExistentImage() throws Exception { exception.expect(NotFoundException.class); } - dockerRule.getClient().pushImageCmd(username + "/xxx") - .exec(new PushImageResultCallback()) + dockerRule.getClient().pushImageCmd(UUID.randomUUID().toString().replace("-", "")) + .start() .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep } @Test public void testPushImageWithValidAuth() throws Exception { - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-valid-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @Test public void testPushImageWithNoAuth() throws Exception { - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-no-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-no-auth"); exception.expect(DockerClientException.class); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -115,14 +116,14 @@ public void testPushImageWithInvalidAuth() throws Exception { .withEmail("foo@bar.de") .withRegistryAddress(authConfig.getRegistryAddress()); - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-invalid-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-invalid-auth"); exception.expect(DockerClientException.class); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(invalidAuthConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java index 29abc7722..408098148 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Container; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import org.hamcrest.Matcher; import org.junit.Test; import org.slf4j.Logger; @@ -24,12 +23,12 @@ public class RemoveContainerCmdImplIT extends CmdIT { @Test - public void removeContainer() throws DockerException { + public void removeContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); LOG.info("Removing container: {}", container.getId()); dockerRule.getClient().removeContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java index 9d2325f63..00d2e6cc1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java @@ -11,9 +11,10 @@ import java.util.List; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -23,11 +24,11 @@ public class RemoveImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdIT.class); @Test - public void removeImage() throws DockerException, InterruptedException { + public void removeImage() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container {}", container.toString()); @@ -46,7 +47,7 @@ public void removeImage() throws DockerException, InterruptedException { } @Test(expected = NotFoundException.class) - public void removeNonExistingImage() throws DockerException, InterruptedException { + public void removeNonExistingImage() throws DockerException { dockerRule.getClient().removeImageCmd("non-existing").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java index 562e43c4c..6d0fdf981 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.NotFoundException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -15,14 +17,16 @@ public class RemoveVolumeCmdIT extends CmdIT { @Test(expected = NotFoundException.class) public void removeVolume() throws DockerException { - String volumeName = "volume1" + dockerRule.getKind(); + String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd() .withName(volumeName) - .withDriver("local").exec(); + .withDriver("local") + .withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo(volumeName)); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString(volumeName)); dockerRule.getClient().removeVolumeCmd(volumeName).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java index a0708ff7a..c50ebcf43 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotEquals; @@ -21,7 +22,7 @@ public void renameContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -30,7 +31,7 @@ public void renameContainer() throws DockerException { String name1 = inspectContainerResponse.getName(); dockerRule.getClient().renameContainerCmd(container.getId()) - .withName(dockerRule.getKind() + "renameContainer") + .withName("renameContainer") .exec(); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -44,9 +45,9 @@ public void renameContainer() throws DockerException { } @Test(expected = NotFoundException.class) - public void renameExistingContainer() throws DockerException, InterruptedException { + public void renameExistingContainer() throws DockerException { dockerRule.getClient().renameContainerCmd("non-existing") - .withName(dockerRule.getKind() + "renameExistingContainer") + .withName("renameExistingContainer") .exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java new file mode 100644 index 000000000..eeb79b2ff --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java @@ -0,0 +1,39 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.security.SecureRandom; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class ResizeContainerCmdIT extends CmdIT { + private static final Logger LOG = LoggerFactory.getLogger(ResizeContainerCmdIT.class); + + private static final int TTY_HEIGHT = 30; + private static final int TTY_WIDTH = 120; + + @Test + public void resizeContainerTtyTest() { + String containerName = "generated_" + new SecureRandom().nextInt(); + + // wait until tty size changed to target size + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root") + .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH)) + .withName(containerName).withTty(true).withStdinOpen(true).exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + dockerRule.getClient().resizeContainerCmd(container.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec(); + + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() + .awaitStatusCode(10, TimeUnit.SECONDS); + + LOG.info("Container exit code: {}", exitCode); + + assertThat(exitCode, equalTo(0)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java new file mode 100644 index 000000000..9e5c9b65f --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java @@ -0,0 +1,48 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.ExecCreateCmdResponse; +import com.github.dockerjava.core.command.ExecStartResultCallback; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.security.SecureRandom; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + + +public class ResizeExecCmdIT extends CmdIT { + private static final Logger LOG = LoggerFactory.getLogger(ResizeExecCmdIT.class); + + private static final int TTY_HEIGHT = 30; + private static final int TTY_WIDTH = 120; + + @Test + public void resizeExecInstanceTtyTest() throws Exception { + String containerName = "generated_" + new SecureRandom().nextInt(); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root") + .withCmd("sleep", "9999").withName(containerName).exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + // wait until tty size changed to target size + ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId()).withTty(true) + .withAttachStdout(true).withAttachStderr(true) + .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH)).exec(); + + final ExecStartResultCallback execStartResultCallback = new ExecStartResultCallback(System.out, System.err); + + dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId()).exec(execStartResultCallback).awaitStarted(); + + dockerRule.getClient().resizeExecCmd(execCreateCmdResponse.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec(); + + // time out, exec instance resize failed + boolean waitResult = execStartResultCallback.awaitCompletion(10, TimeUnit.SECONDS); + + assertThat(waitResult, equalTo(true)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index f49e7baaa..592c9c650 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -1,18 +1,24 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.RemoteApiVersion; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; +import static org.junit.Assume.assumeThat; public class RestartContainerCmdImplIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(RestartContainerCmdImplIT.class); @@ -22,7 +28,7 @@ public void restartContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -44,8 +50,43 @@ public void restartContainer() throws DockerException { dockerRule.getClient().killContainerCmd(container.getId()).exec(); } + @Test + public void restartContainerWithSignal() throws Exception { + assumeThat("API version should be >= 1.42", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_42)); + + DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(RemoteApiVersion.VERSION_1_44) + .withRegistryUrl("https://index.docker.io/v1/") + .build(); + try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) { + String expectedUserSignal = "10"; + String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; while :; do sleep 1; done"; + final String containerId = dockerClient + .createContainerCmd(DEFAULT_IMAGE) + .withCmd( + "/bin/sh", + "-c", + String.format(initialCommandWithTrap, expectedUserSignal)) + .exec() + .getId(); + assertThat(containerId, not(is(emptyString()))); + dockerClient.startContainerCmd(containerId).exec(); + + // Restart container without signal + dockerClient.restartContainerCmd(containerId).exec(); + String log = dockerRule.containerLog(containerId); + assertThat(log.trim(), emptyString()); + + dockerClient.restartContainerCmd(containerId).withSignal(expectedUserSignal).exec(); + log = dockerRule.containerLog(containerId); + assertThat(log.trim(), is("exit trapped")); + + dockerClient.removeContainerCmd(containerId).withForce(true).withRemoveVolumes(true).exec(); + } + } + @Test(expected = NotFoundException.class) - public void restartNonExistingContainer() throws DockerException, InterruptedException { + public void restartNonExistingContainer() throws DockerException { dockerRule.getClient().restartContainerCmd("non-existing").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java index a9ba8ac25..cb5a4666c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java @@ -8,7 +8,7 @@ import java.io.InputStream; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; public class SaveImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdIT.class); @@ -16,13 +16,19 @@ public class SaveImageCmdIT extends CmdIT { @Test public void saveImage() throws Exception { - InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec()); - assertThat(image.available(), greaterThan(0)); - - InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec()); - assertThat(image2.available(), greaterThan(0)); - - + try ( + InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image.read(), not(-1)); + } + + try ( + InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec(); + InputStream image2 = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image2.read(), not(-1)); + } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java new file mode 100644 index 000000000..86b246029 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java @@ -0,0 +1,52 @@ +package com.github.dockerjava.cmd; + +import org.apache.commons.io.IOUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; + +public class SaveImagesCmdIT extends CmdIT { + public static final Logger LOG = LoggerFactory.getLogger(SaveImagesCmdIT.class); + + @Test + public void saveNoImages() throws Exception { + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd().exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ){ + assertThat(image.read(), not(-1)); + } + + } + + @Test + public void saveImagesWithNameAndTag() throws Exception { + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image.read(), not(-1)); + } + + } + + @Test + public void saveMultipleImages() throws Exception { + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd() + // Not a real life use-case but "busybox" is the only one I dare to assume is really there. + .withImage("busybox", "latest") + .withImage("busybox", "latest") + .exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image.read(), not(-1)); + } + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java index 0dba9aefd..26dcebbeb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java @@ -11,9 +11,7 @@ import static ch.lambdaj.Lambda.filter; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; public class SearchImagesCmdIT extends CmdIT { @@ -30,4 +28,37 @@ public void searchImages() throws DockerException { assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); } + @Test(expected = IllegalArgumentException.class) + public void searchImagesWithInvalidMinimumLimit() throws DockerException { + dockerRule.getClient().searchImagesCmd("busybox").withLimit(0).exec(); + } + + @Test(expected = IllegalArgumentException.class) + public void searchImagesWithInvalidMaximumLimit() throws DockerException { + dockerRule.getClient().searchImagesCmd("busybox").withLimit(101).exec(); + } + + @Test + public void searchImagesWithValidMinimumLimit() throws DockerException { + List dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec(); + LOG.info("Search returned {}", dockerSearch.toString()); + + Matcher matcher = hasItem(hasField("name", equalTo("busybox"))); + assertThat(dockerSearch, matcher); + + assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); + + assertThat(dockerSearch.size(), equalTo(1)); + } + + @Test + public void searchImagesWithValidMaximumLimit() throws DockerException { + List dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec(); + LOG.info("Search returned {}", dockerSearch.toString()); + + Matcher matcher = hasItem(hasField("name", equalTo("busybox"))); + assertThat(dockerSearch, matcher); + + assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index b0c6508a6..5d41889ca 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -14,7 +14,6 @@ import com.github.dockerjava.api.model.RestartPolicy; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.slf4j.Logger; @@ -35,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; @@ -45,7 +44,7 @@ public class StartContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class); @Test - public void startContainerWithVolumes() throws DockerException { + public void startContainerWithVolumes() { // see http://docs.docker.io/use/working_with_volumes/ Volume volume1 = new Volume("/opt/webapp1"); @@ -55,12 +54,12 @@ public void startContainerWithVolumes() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2) .withCmd("true") .withHostConfig(newHostConfig() - .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))) + .withBinds(new Bind("/tmp/webapp1", volume1, ro), new Bind("/tmp/webapp2", volume2))) .exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -68,7 +67,7 @@ public void startContainerWithVolumes() throws DockerException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -79,9 +78,9 @@ public void startContainerWithVolumes() throws DockerException { assertThat(mounts, hasSize(2)); final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount() - .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1"); + .withRw(false).withMode("ro").withDestination(volume1).withSource("/tmp/webapp1"); final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount() - .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2"); + .withRw(true).withMode("rw").withDestination(volume2).withSource("/tmp/webapp2"); assertThat(mounts, containsInAnyOrder(mount1, mount2)); } @@ -97,7 +96,7 @@ public void startContainerWithVolumesFrom() throws DockerException { CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(container1Name) .withHostConfig(newHostConfig() - .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2))) + .withBinds(new Bind("/tmp/webapp1", volume1), new Bind("/tmp/webapp2", volume2))) .exec(); LOG.info("Created container1 {}", container1.toString()); @@ -137,7 +136,7 @@ public void startContainerWithDns() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -159,7 +158,7 @@ public void startContainerWithDnsSearch() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -172,7 +171,7 @@ public void startContainerWithDnsSearch() throws DockerException { @Test public void startContainerWithPortBindings() throws DockerException { - int baseport = getFactoryType() == FactoryType.JERSEY ? 13000 : 14000; + int baseport = 20_000; ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); @@ -189,7 +188,7 @@ public void startContainerWithPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -228,7 +227,7 @@ public void startContainerWithRandomPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -261,15 +260,15 @@ public void startContainerWithConflictingPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); } @Test public void startContainerWithLinkingDeprecated() throws DockerException { - String container1Name = "containerWithLink1" + dockerRule.getKind(); - String container2Name = "containerWithLink2" + dockerRule.getKind(); + String container1Name = "containerWithLink1"; + String container2Name = "containerWithLink2"; dockerRule.ensureContainerRemoved(container1Name); dockerRule.ensureContainerRemoved(container2Name); @@ -279,7 +278,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException { .exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -288,10 +287,10 @@ public void startContainerWithLinkingDeprecated() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -305,7 +304,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container2.getId()).exec(); @@ -314,14 +313,14 @@ public void startContainerWithLinkingDeprecated() throws DockerException { LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name, container1Name + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getState(), is(notNullValue())); assertThat(inspectContainerResponse2.getState().getRunning(), is(true)); @@ -329,8 +328,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException { @Test public void startContainerWithLinking() throws DockerException { - String container1Name = "containerWithLinking1" + dockerRule.getKind(); - String container2Name = "containerWithLinking2" + dockerRule.getKind(); + String container1Name = "containerWithLinking1"; + String container2Name = "containerWithLinking2"; dockerRule.ensureContainerRemoved(container1Name); dockerRule.ensureContainerRemoved(container2Name); @@ -340,7 +339,7 @@ public void startContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -349,10 +348,10 @@ public void startContainerWithLinking() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -366,7 +365,7 @@ public void startContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container2.getId()).exec(); @@ -375,14 +374,14 @@ public void startContainerWithLinking() throws DockerException { LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name, container1Name + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getState(), is(notNullValue())); assertThat(inspectContainerResponse2.getState().getRunning(), is(true)); @@ -395,7 +394,7 @@ public void startContainer() throws DockerException { .exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -403,11 +402,11 @@ public void startContainer() throws DockerException { LOG.info("Container Inspect: {}", inspectContainerResponse.toString()); assertThat(inspectContainerResponse.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse.getId(), startsWith(container.getId())); - assertThat(inspectContainerResponse.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse.getState(), is(notNullValue())); assertThat(inspectContainerResponse.getState().getRunning(), is(true)); @@ -439,7 +438,7 @@ public void startContainerWithNetworkMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -462,7 +461,7 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -486,7 +485,7 @@ public void startContainerWithDevices() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -508,7 +507,7 @@ public void startContainerWithExtraHosts() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -533,7 +532,7 @@ public void startContainerWithRestartPolicy() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -557,7 +556,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); // start container _without_any_customization_ (important!) dockerRule.getClient().startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java index 7c9fee550..c4f9fef57 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java @@ -1,51 +1,42 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallbackTemplate; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Statistics; -import com.github.dockerjava.core.async.ResultCallbackTemplate; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.security.SecureRandom; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; -import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class StatsCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(StatsCmdIT.class); - private static int NUM_STATS = 5; + private static int NUM_STATS = 3; @Test public void testStatsStreaming() throws InterruptedException, IOException { - TimeUnit.SECONDS.sleep(1); - CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS); - String containerName = "generated_" + new SecureRandom().nextInt(); - - CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") - .withName(containerName).exec(); - LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec( - new StatsCallbackTest(countDownLatch)); - - countDownLatch.await(3, TimeUnit.SECONDS); - Boolean gotStats = statsCallback.gotStats(); + boolean gotStats = false; + try (StatsCallbackTest statsCallback = dockerRule.getClient() + .statsCmd(container.getId()) + .exec(new StatsCallbackTest(countDownLatch))) { - LOG.info("Stop stats collection"); + assertTrue(countDownLatch.await(10, TimeUnit.SECONDS)); + gotStats = statsCallback.gotStats(); - statsCallback.close(); + LOG.info("Stop stats collection"); + } LOG.info("Stopping container"); dockerRule.getClient().stopContainerCmd(container.getId()).exec(); @@ -53,10 +44,33 @@ public void testStatsStreaming() throws InterruptedException, IOException { LOG.info("Completed test"); assertTrue("Expected true", gotStats); + } + @Test + public void testStatsNoStreaming() throws InterruptedException, IOException { + CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()) + .withNoStream(true) + .exec(new StatsCallbackTest(countDownLatch))) { + countDownLatch.await(5, TimeUnit.SECONDS); + + LOG.info("Stop stats collection"); + } + + LOG.info("Stopping container"); + dockerRule.getClient().stopContainerCmd(container.getId()).exec(); + dockerRule.getClient().removeContainerCmd(container.getId()).exec(); + + LOG.info("Completed test"); + assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1); } - private class StatsCallbackTest extends ResultCallbackTemplate { + private static class StatsCallbackTest extends ResultCallbackTemplate { private final CountDownLatch countDownLatch; private Boolean gotStats = false; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java index 32c4d904f..7e88cf088 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class StopContainerCmdIT extends CmdIT { @@ -23,7 +23,7 @@ public void testStopContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Stopping container: {}", container.getId()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java index 88bd28fd4..fc5894455 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java @@ -1,7 +1,7 @@ package com.github.dockerjava.cmd; import com.github.dockerjava.api.exception.NotFoundException; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +11,8 @@ public class TagImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdIT.class); @Test - public void tagImage() throws Exception { - String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE); + public void tagImage() { + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); @@ -20,9 +20,9 @@ public void tagImage() throws Exception { } @Test(expected = NotFoundException.class) - public void tagNonExistingImage() throws Exception { + public void tagNonExistingImage() { - String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE); + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java new file mode 100644 index 000000000..3c991a8f1 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java @@ -0,0 +1,91 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.transport.DockerHttpClient; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +class TrackingDockerHttpClient implements DockerHttpClient { + + static final Set ACTIVE_RESPONSES = Collections.newSetFromMap(new ConcurrentHashMap<>()); + + private final DockerHttpClient delegate; + + TrackingDockerHttpClient(DockerHttpClient delegate) { + this.delegate = delegate; + } + + @Override + public Response execute(Request request) { + return new TrackedResponse(delegate.execute(request)) { + { + synchronized (ACTIVE_RESPONSES) { + ACTIVE_RESPONSES.add(this); + } + } + + @Override + public void close() { + synchronized (ACTIVE_RESPONSES) { + ACTIVE_RESPONSES.remove(this); + } + super.close(); + } + }; + } + + @Override + public void close() throws IOException { + delegate.close(); + } + + static class TrackedResponse implements Response { + + private static class AllocatedAt extends Exception { + public AllocatedAt(String message) { + super(message); + } + } + + final Exception allocatedAt = new AllocatedAt(this.toString()); + + private final Response delegate; + + TrackedResponse(Response delegate) { + this.delegate = delegate; + } + + @Override + public int getStatusCode() { + return delegate.getStatusCode(); + } + + @Override + public Map> getHeaders() { + return delegate.getHeaders(); + } + + @Override + public InputStream getBody() { + return delegate.getBody(); + } + + @Override + public void close() { + delegate.close(); + } + + @Override + @Nullable + public String getHeader(@Nonnull String name) { + return delegate.getHeader(name); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java index b28b22a23..2c970aee1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class UnpauseCmdIT extends CmdIT { @@ -21,7 +22,7 @@ public void unpausePausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -35,7 +36,7 @@ public void unpauseRunningContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -47,7 +48,7 @@ public void unpauseStoppedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -67,7 +68,7 @@ public void unpauseCreatedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().unpauseContainerCmd(container.getId()).exec(); } @@ -77,7 +78,7 @@ public void unpauseUnpausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java index aaa023db8..e1e637809 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java @@ -16,7 +16,7 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -31,7 +31,7 @@ public class UpdateContainerCmdIT extends CmdIT { @Test - public void updateContainer() throws DockerException, IOException { + public void updateContainer() throws DockerException { assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22)); CreateContainerResponse response = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) @@ -48,8 +48,8 @@ public void updateContainer() throws DockerException, IOException { dockerRule.getClient().updateContainerCmd(containerId) .withBlkioWeight(300) .withCpuShares(512) - .withCpuPeriod(100000) - .withCpuQuota(50000) + .withCpuPeriod(100000L) + .withCpuQuota(50000L) // .withCpusetCpus("0") // depends on env .withCpusetMems("0") // .withMemory(209715200L + 2L) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java index 08a198b9f..90c7e534e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java @@ -2,7 +2,7 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ public void version() throws DockerException { assertTrue(version.getGoVersion().length() > 0); assertTrue(version.getVersion().length() > 0); - assertEquals(StringUtils.split(version.getVersion(), ".").length, 3); + assertEquals(3, StringUtils.split(version.getVersion(), ".").length); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java index 4298f68c3..3a39b3eea 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java @@ -1,24 +1,32 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.BuildImageCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.command.WaitContainerResultCallback; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; -import com.github.dockerjava.core.command.WaitContainerResultCallback; +import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_30; +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; +import static org.junit.Assume.assumeThat; public class WaitContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class); @@ -29,11 +37,11 @@ public void testWaitContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()) + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() .awaitStatusCode(); LOG.info("Container exit code: {}", exitCode); @@ -47,15 +55,15 @@ public void testWaitContainer() throws DockerException { } @Test(expected = NotFoundException.class) - public void testWaitNonExistingContainer() throws DockerException { + public void testWaitNonExistingContainer() throws Exception { - WaitContainerResultCallback callback = new WaitContainerResultCallback() { + ResultCallback.Adapter callback = new ResultCallback.Adapter() { public void onNext(WaitResponse waitResponse) { throw new AssertionError("expected NotFoundException"); } }; - dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitCompletion(); } @Test @@ -64,12 +72,11 @@ public void testWaitContainerAbort() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec( - new WaitContainerResultCallback()); + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).start(); Thread.sleep(5000); @@ -84,12 +91,12 @@ public void testWaitContainerAbort() throws Exception { } @Test - public void testWaitContainerTimeout() throws Exception { + public void testWaitContainerTimeout() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -102,4 +109,77 @@ public void testWaitContainerTimeout() throws Exception { LOG.info(e.getMessage()); } } + + @Test + public void testWaitNotStartedContainer() { + assumeThat("API version should be > 1.25", dockerRule, isGreaterOrEqual(VERSION_1_25)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withHostConfig(newHostConfig().withAutoRemove(true)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()); + + Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(0, statusCode.intValue()); + } + + @Test + public void testWaitContainerWithAutoRemoval() { + assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("false") + .withHostConfig(newHostConfig().withAutoRemove(true)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback removedCondition = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.REMOVED) + .exec(new WaitContainerResultCallback()); + + WaitContainerResultCallback nextExitCondition = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Assert.assertEquals(1, removedCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue()); + Assert.assertEquals(1, nextExitCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue()); + } + + @Test + public void testWaitRestartedContainer() { + assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("sh", "-c", "[ -f \"$HOME/.first_run_marker\" ] && exit 2 || { touch \"$HOME/.first_run_marker\"; exit 1; }") + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback firstExitCallback = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Integer firstStatusCode = firstExitCallback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(1, firstStatusCode.intValue()); + + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(2, statusCode.intValue()); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java new file mode 100644 index 000000000..8ebb610b9 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; + +public class CreateConfigCmdExecIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(CreateConfigCmdExecIT.class); + + @Test + public void testCreateConfig() { + DockerClient dockerClient = startSwarm(); + String configName = RandomStringUtils.random(10, true, false); + CreateConfigResponse response = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()).exec(); + assertThat(response, notNullValue()); + String configId = response.getId(); + assertThat(configId, notNullValue()); + + dockerClient.removeConfigCmd(configId).exec(); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java index 7fdfeb96e..4644a8330 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java @@ -1,12 +1,11 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateSecretResponse; -import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.hamcrest.collection.IsCollectionWithSize; import org.junit.Test; import org.slf4j.Logger; @@ -20,35 +19,30 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class); - private static final String SERVICE_NAME = "theservice"; @Test - public void testCreateSecret() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - + public void testCreateSecret() { + DockerClient dockerClient = startSwarm(); int length = 10; boolean useLetters = true; boolean useNumbers = false; String secretName = RandomStringUtils.random(length, useLetters, useNumbers); - CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); + CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); assertThat(exec, notNullValue()); assertThat(exec.getId(), notNullValue()); LOG.info("Secret created with ID {}", exec.getId()); - List secrets = dockerRule.getClient().listSecretsCmd() + List secrets = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); assertThat(secrets, IsCollectionWithSize.hasSize(1)); - dockerRule.getClient().removeSecretCmd(secrets.get(0).getId()) + dockerClient.removeSecretCmd(secrets.get(0).getId()) .exec(); LOG.info("Secret removed with ID {}", exec.getId()); - List secretsAfterRemoved = dockerRule.getClient().listSecretsCmd() + List secretsAfterRemoved = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index 27eae0b6e..e221d9cd3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -1,6 +1,9 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.EndpointResolutionMode; import com.github.dockerjava.api.model.EndpointSpec; @@ -13,19 +16,24 @@ import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TmpfsOptions; +import com.github.dockerjava.junit.PrivateRegistryRule; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.List; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @@ -35,37 +43,42 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class); private static final String SERVICE_NAME = "theservice"; + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + + @Rule + public ExpectedException exception = ExpectedException.none(); + private AuthConfig authConfig; + + private DockerClient dockerClient; + + @Before + public final void setUpCreateServiceCmdExecIT() { + authConfig = REGISTRY.getAuthConfig(); + dockerClient = startSwarm(); + } + @Test public void testCreateService() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec() .withImage(DEFAULT_IMAGE)))) .exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); assertThat(services, hasSize(1)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test public void testCreateServiceWithNetworks() { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - - String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname") + String networkId = dockerClient.createNetworkCmd().withName("networkname") .withDriver("overlay") .withIpam(new Network.Ipam() .withDriver("default")) @@ -74,6 +87,7 @@ public void testCreateServiceWithNetworks() { .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withForceUpdate(0) + .withRuntime("container") .withContainerSpec(new ContainerSpec() .withImage("busybox")) ) @@ -94,9 +108,9 @@ public void testCreateServiceWithNetworks() { .withProtocol(PortConfigProtocol.TCP) ))); - dockerRule.getClient().createServiceCmd(spec).exec(); + dockerClient.createServiceCmd(spec).exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); @@ -104,32 +118,67 @@ public void testCreateServiceWithNetworks() { assertThat(services.get(0).getSpec(), is(spec)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test public void testCreateServiceWithTmpfs() { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo"); - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec().withImage(DEFAULT_IMAGE).withMounts(Collections.singletonList(tmpMount))))) .exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); assertThat(services, hasSize(1)); - List mounts = dockerRule.getClient().inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate() + List mounts = dockerClient.inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate() .getContainerSpec().getMounts(); assertThat(mounts, hasSize(1)); assertThat(mounts.get(0), is(tmpMount)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); + } + + @Test + public void testCreateServiceWithValidAuth() throws DockerException { + dockerClient.createServiceCmd(new ServiceSpec() + .withName(SERVICE_NAME) + .withTaskTemplate(new TaskSpec() + .withContainerSpec(new ContainerSpec() + .withImage(DEFAULT_IMAGE)))) + .withAuthConfig(authConfig) + .exec(); + + List services = dockerClient.listServicesCmd() + .withNameFilter(Lists.newArrayList(SERVICE_NAME)) + .exec(); + + assertThat(services, hasSize(1)); + + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); + } + + @Test + @Ignore // TODO rework test (does not throw as expected atm) + public void testCreateServiceWithInvalidAuth() throws DockerException { + AuthConfig invalidAuthConfig = new AuthConfig() + .withUsername("testuser") + .withPassword("testwrongpassword") + .withEmail("foo@bar.de") + .withRegistryAddress(authConfig.getRegistryAddress()); + + exception.expect(ConflictException.class); + + dockerClient.createServiceCmd(new ServiceSpec() + .withName(SERVICE_NAME) + .withTaskTemplate(new TaskSpec() + .withContainerSpec(new ContainerSpec() + .withImage(DEFAULT_IMAGE)))) + .withAuthConfig(invalidAuthConfig) + .exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java index 503f22645..6341f4b30 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java @@ -1,7 +1,7 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; import com.github.dockerjava.api.model.SwarmDispatcherConfig; @@ -22,9 +22,10 @@ public class InitializeSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class); @Test - public void initializeSwarm() throws DockerException { + public void initializeSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm") + .withName("default") .withDispatcher(new SwarmDispatcherConfig() .withHeartbeatPeriod(10000000L) ).withOrchestration(new SwarmOrchestration() @@ -38,30 +39,23 @@ public void initializeSwarm() throws DockerException { .withLogEntriesForSlowFollowers(200) ).withTaskDefaults(new TaskDefaults()); - dockerRule.getClient().initializeSwarmCmd(swarmSpec) + dockerClient.initializeSwarmCmd(swarmSpec) .withListenAddr("127.0.0.1") .withAdvertiseAddr("127.0.0.1") .exec(); LOG.info("Initialized swarm: {}", swarmSpec.toString()); - Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + Swarm swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); assertThat(swarm.getSpec(), is(equalTo(swarmSpec))); } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm"); - - dockerRule.getClient().initializeSwarmCmd(swarmSpec) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - LOG.info("Initialized swarm: {}", swarmSpec.toString()); + DockerClient dockerClient = startSwarm(); // Initializing a swarm if already in swarm mode should fail - dockerRule.getClient().initializeSwarmCmd(swarmSpec) + dockerClient.initializeSwarmCmd(new SwarmSpec()) .withListenAddr("127.0.0.1") .exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java new file mode 100644 index 000000000..12c69c996 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.Config; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.Assert.assertEquals; + +public class InspectConfigCmdIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(InspectConfigCmdIT.class); + + @Test + public void inspectConfig() throws DockerException { + DockerClient dockerClient = startSwarm(); + + String configName = RandomStringUtils.random(10, true, false); + + CreateConfigResponse configResponse = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()).exec(); + LOG.info("Config created with ID {}", configResponse.getId()); + + Config config = dockerClient.inspectConfigCmd(configResponse.getId()).exec(); + assertEquals(configResponse.getId(), config.getId()); + assertEquals(configName, config.getSpec().getName()); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java index 6514f3d04..16f1b0911 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java @@ -2,13 +2,13 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.api.model.LocalNodeState; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmJoinTokens; import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; +import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +21,16 @@ public class JoinSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class); + private DockerClient docker1; + + private DockerClient docker2; + + @Before + public void setUp() throws Exception { + docker1 = startDockerInDocker(); + docker2 = startDockerInDocker(); + } + private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { SwarmSpec swarmSpec = new SwarmSpec(); docker.initializeSwarmCmd(swarmSpec) @@ -33,10 +43,7 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { } @Test - public void joinSwarmAsWorker() throws DockerException { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - + public void joinSwarmAsWorker() { SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -51,10 +58,7 @@ public void joinSwarmAsWorker() throws DockerException { } @Test - public void joinSwarmAsManager() throws DockerException, InterruptedException { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - + public void joinSwarmAsManager() throws DockerException { SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -68,11 +72,8 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException { assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE))); } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void joinSwarmIfAlreadyInSwarm() { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - SwarmJoinTokens tokens = initSwarmOnDocker(docker1); initSwarmOnDocker(docker2); @@ -82,5 +83,4 @@ public void joinSwarmIfAlreadyInSwarm() { .withJoinToken(tokens.getWorker()) .exec(); } - } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java index 4f093ca94..e6d652d43 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java @@ -1,10 +1,9 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.api.model.LocalNodeState; -import com.github.dockerjava.api.model.SwarmSpec; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,36 +14,32 @@ public class LeaveSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class); - + @Test public void leaveSwarmAsMaster() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec"); - dockerRule.getClient().initializeSwarmCmd(swarmSpec) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - LOG.info("Initialized swarm: {}", swarmSpec.toString()); + DockerClient dockerClient = startSwarm(); - Info info = dockerRule.getClient().infoCmd().exec(); + Info info = dockerClient.infoCmd().exec(); LOG.info("Inspected docker: {}", info.toString()); assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE)); - dockerRule.getClient().leaveSwarmCmd() + dockerClient.leaveSwarmCmd() .withForceEnabled(true) .exec(); LOG.info("Left swarm"); - info = dockerRule.getClient().infoCmd().exec(); + info = dockerClient.infoCmd().exec(); LOG.info("Inspected docker: {}", info.toString()); assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE)); } - @Test(expected = NotAcceptableException.class) - public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException { - dockerRule.getClient().leaveSwarmCmd().exec(); + @Test(expected = DockerException.class) + public void leavingSwarmThrowsWhenNotInSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); + dockerClient.leaveSwarmCmd().exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java new file mode 100644 index 000000000..2c19a7f0e --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java @@ -0,0 +1,54 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.Config; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; + +public class ListConfigCmdExecIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(ListConfigCmdExecIT.class); + + @Test + public void tesListConfig() throws DockerException { + DockerClient dockerClient = startSwarm(); + String configName = RandomStringUtils.random(10, true, false); + CreateConfigResponse response = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()) + .exec(); + String configId = response.getId(); + + try { + LOG.info("Config created with ID {}", configId); + + List configs = dockerClient.listConfigsCmd() + .withFilters(Collections.singletonMap("name", Arrays.asList(configName))) + .exec(); + + assertThat(configs, hasSize(1)); + } finally { + dockerClient.removeConfigCmd(configId).exec(); + LOG.info("Config removed with ID {}", configId); + } + + List configsAfterRemoved = dockerClient.listConfigsCmd() + .withFilters(Collections.singletonMap("name", Arrays.asList(configName))) + .exec(); + + assertThat(configsAfterRemoved, hasSize(0)); + + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java index bb779e7f3..ce90f23a0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java @@ -1,12 +1,12 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateSecretResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,31 +23,27 @@ public class ListSecretCmdExecIT extends SwarmCmdIT { @Test public void tesListSecret() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - + DockerClient dockerClient = startSwarm(); int length = 10; boolean useLetters = true; boolean useNumbers = false; String secretName = RandomStringUtils.random(length, useLetters, useNumbers); - CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); + CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); assertThat(exec, notNullValue()); assertThat(exec.getId(), notNullValue()); LOG.info("Secret created with ID {}", exec.getId()); - List secrets = dockerRule.getClient().listSecretsCmd() + List secrets = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); assertThat(secrets, hasSize(1)); - dockerRule.getClient().removeSecretCmd(secrets.get(0).getId()) + dockerClient.removeSecretCmd(secrets.get(0).getId()) .exec(); LOG.info("Secret removed with ID {}", exec.getId()); - List secretsAfterRemoved = dockerRule.getClient().listSecretsCmd() + List secretsAfterRemoved = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 17e3303de..715ba60c8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -2,13 +2,11 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateServiceResponse; -import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.Service; import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import org.junit.Test; import org.slf4j.Logger; @@ -18,7 +16,7 @@ import java.util.List; import java.util.Map; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; @@ -29,11 +27,10 @@ public class ListServicesCmdExecIT extends SwarmCmdIT { private static final String LABEL_VALUE = "test"; @Test - public void testListServices() throws DockerException { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); + public void testListServices() { + DockerClient dockerClient = startSwarm(); Map serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE); - CreateServiceResponse response = docker1.createServiceCmd(new ServiceSpec() + CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec() .withLabels(serviceLabels) .withName(SERVICE_NAME) .withMode(new ServiceModeConfig().withReplicated( @@ -46,14 +43,14 @@ public void testListServices() throws DockerException { .exec(); String serviceId = response.getId(); //filtering with service id - List services = docker1.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); + List services = dockerClient.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); assertThat(services, hasSize(1)); //filtering with service name - services = docker1.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); + services = dockerClient.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); assertThat(services, hasSize(1)); //filter labels - services = docker1.listServicesCmd().withLabelFilter(serviceLabels).exec(); + services = dockerClient.listServicesCmd().withLabelFilter(serviceLabels).exec(); assertThat(services, hasSize(1)); - docker1.removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java new file mode 100644 index 000000000..853dc6c03 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java @@ -0,0 +1,89 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.model.SwarmNode; +import org.junit.Test; + +import java.util.Collections; +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class ListSwarmNodesCmdExecIT extends SwarmCmdIT { + @Test + public void testListSwarmNodes() { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + } + + @Test + public void testListSwarmNodesWithIdFilter() { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + + String nodeId = nodes.get(0).getId(); + List nodesWithId = dockerClient.listSwarmNodesCmd() + .withIdFilter(Collections.singletonList(nodeId)) + .exec(); + assertThat(nodesWithId.size(), is(1)); + + List nodesWithNonexistentId = dockerClient.listSwarmNodesCmd() + .withIdFilter(Collections.singletonList("__nonexistent__")) + .exec(); + assertThat(nodesWithNonexistentId.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithNameFilter() { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + + String nodeName = nodes.get(0).getSpec().getName(); + List nodesWithFirstNodesName = dockerClient.listSwarmNodesCmd() + .withNameFilter(Collections.singletonList(nodeName)) + .exec(); + assertThat(nodesWithFirstNodesName.size(), is(1)); + + List nodesWithNonexistentName = dockerClient.listSwarmNodesCmd() + .withNameFilter(Collections.singletonList("__nonexistent__")) + .exec(); + assertThat(nodesWithNonexistentName.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithMembershipFilter() { + DockerClient dockerClient = startSwarm(); + + List nodesWithAcceptedMembership = dockerClient.listSwarmNodesCmd() + .withMembershipFilter(Collections.singletonList("accepted")) + .exec(); + assertThat(nodesWithAcceptedMembership.size(), is(1)); + + List nodesWithPendingMembership = dockerClient.listSwarmNodesCmd() + .withMembershipFilter(Collections.singletonList("pending")) + .exec(); + assertThat(nodesWithPendingMembership.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithRoleFilter() { + DockerClient dockerClient = startSwarm(); + + List nodesWithManagerRole = dockerClient.listSwarmNodesCmd() + .withRoleFilter(Collections.singletonList("manager")) + .exec(); + assertThat(nodesWithManagerRole.size(), is(1)); + + List nodesWithWorkerRole = dockerClient.listSwarmNodesCmd() + .withRoleFilter(Collections.singletonList("worker")) + .exec(); + assertThat(nodesWithWorkerRole.size(), is(0)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java index 228ccbac8..8ce672b1b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java @@ -1,12 +1,12 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateServiceResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.Task; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; @@ -17,8 +17,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @@ -31,12 +33,9 @@ public class ListTasksCmdExecIT extends SwarmCmdIT { @Test public void testListTasks() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); + DockerClient dockerClient = startSwarm(); Map taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE); - CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec() + CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withMode(new ServiceModeConfig().withReplicated( new ServiceReplicatedModeOptions() @@ -48,27 +47,35 @@ public void testListTasks() throws DockerException { .exec(); String serviceId = response.getId(); //filtering with service id - List tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(); - assertThat(tasks, hasSize(2)); - String taskId = tasks.get(0).getId(), secondId = tasks.get(1).getId(); + List tasks = await().until( + () -> dockerClient.listTasksCmd().withServiceFilter(serviceId).exec(), + hasSize(2) + ); + String taskId = tasks.get(0).getId(); + String secondTaskId = tasks.get(1).getId(); //filtering with unique id - tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec(); + tasks = dockerClient.listTasksCmd().withIdFilter(taskId).exec(); assertThat(tasks, hasSize(1)); assertThat(tasks.get(0).getId(), is(taskId)); //filtering with multiple id - tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondId, taskId).exec(); + tasks = dockerClient.listTasksCmd().withIdFilter(secondTaskId, taskId).exec(); + assertThat(tasks, hasSize(2)); //filtering node id - String nodeId = tasks.get(0).getNodeId(); - tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec(); + // Wait for node assignment + String nodeId = await().until(() -> { + return dockerClient.listTasksCmd().withIdFilter(secondTaskId).exec() + .get(0) + .getNodeId(); + }, Objects::nonNull); + tasks = dockerClient.listTasksCmd().withNodeFilter(nodeId).exec(); assertThat(tasks.get(0).getNodeId(), is(nodeId)); //filtering with state - tasks = dockerRule.getClient().listTasksCmd().withStateFilter(TaskState.RUNNING).exec(); + tasks = dockerClient.listTasksCmd().withStateFilter(TaskState.RUNNING).exec(); assertThat(tasks, hasSize(2)); //filter labels - tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(taskLabels).exec(); + tasks = dockerClient.listTasksCmd().withLabelFilter(taskLabels).exec(); assertThat(tasks, hasSize(2)); - tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec(); + tasks = dockerClient.listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec(); assertThat(tasks, hasSize(2)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java index bb96dc3ef..11606dce0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java @@ -8,13 +8,12 @@ import com.github.dockerjava.api.model.ServiceRestartCondition; import com.github.dockerjava.api.model.ServiceRestartPolicy; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.Task; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; import com.github.dockerjava.utils.LogContainerTestCallback; +import org.junit.Ignore; import org.junit.Test; -import org.mockito.internal.matchers.Contains; import java.io.IOException; import java.util.ArrayList; @@ -22,15 +21,17 @@ import java.util.List; import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; public class LogSwarmObjectIT extends SwarmCmdIT { + + @Ignore @Test public void testLogsCmd() throws InterruptedException, IOException { + DockerClient dockerClient = startSwarm(); String snippet = "hello world"; - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet))) .withRestartPolicy(new ServiceRestartPolicy().withCondition(ServiceRestartCondition.NONE)); @@ -38,12 +39,12 @@ public void testLogsCmd() throws InterruptedException, IOException { .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1))) .withTaskTemplate(taskSpec) .withName("log-worker"); - String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId(); + String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId(); int since = (int) System.currentTimeMillis() / 1000; //wait the service to end List tasks = new ArrayList<>(); for (int i = 0; i < 10; i++) { - tasks = docker1.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); + tasks = dockerClient.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); if (tasks.size() == 1) { break; } else { @@ -53,23 +54,23 @@ public void testLogsCmd() throws InterruptedException, IOException { assertThat(tasks.size(), is(1)); String taskId = tasks.get(0).getId(); //check service log - validateLog(docker1.logServiceCmd(serviceId).withStdout(true), snippet); + validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true), snippet); //check task log - validateLog(docker1.logTaskCmd(taskId).withStdout(true), snippet); + validateLog(dockerClient.logTaskCmd(taskId).withStdout(true), snippet); //check details/context - validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); - validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); + // FIXME + // validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); + // validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); //check since - validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); - validateLog(docker1.logTaskCmd(taskId).withStdout(true).withSince(since), snippet); - docker1.removeServiceCmd(serviceId).exec(); + validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); + validateLog(dockerClient.logTaskCmd(taskId).withStdout(true).withSince(since), snippet); + dockerClient.removeServiceCmd(serviceId).exec(); } private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException { - LogContainerTestCallback loggingCallback = new LogContainerTestCallback(); - logCmd.exec(loggingCallback); - loggingCallback.awaitCompletion(5, TimeUnit.SECONDS); - assertThat(loggingCallback.toString(), new Contains(messsage)); - loggingCallback.close(); + try (LogContainerTestCallback loggingCallback = logCmd.exec(new LogContainerTestCallback(true))) { + loggingCallback.awaitCompletion(5, TimeUnit.SECONDS); + assertThat(loggingCallback.toString(), containsString(messsage)); + } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java new file mode 100644 index 000000000..8bdee6947 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java @@ -0,0 +1,44 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.model.Swarm; +import com.github.dockerjava.api.model.SwarmNode; +import com.github.dockerjava.api.model.SwarmNodeRole; +import com.google.common.collect.Lists; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.Optional; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class RemoveSwarmNodeCmdExecIT extends SwarmCmdIT { + + private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExecIT.class); + + @Test + public void testRemoveSwarmNode() throws Exception { + DockerClient dockerClient = startSwarm(); + Swarm swarm = dockerClient.inspectSwarmCmd().exec(); + + DockerClient docker2 = startDockerInDocker(); + docker2.joinSwarmCmd() + .withRemoteAddrs(Lists.newArrayList("docker1")) + .withJoinToken(swarm.getJoinTokens().getWorker()) + .exec(); + LOGGER.info("docker2 joined docker's swarm"); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(2, is(nodes.size())); + Optional firstWorkNode = nodes.stream().filter(node -> node.getSpec().getRole() == SwarmNodeRole.WORKER) + .findFirst(); + dockerClient.removeSwarmNodeCmd(firstWorkNode.get().getId()) + .withForce(true) + .exec(); + nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index da0dafb1f..36bcab840 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -1,61 +1,74 @@ package com.github.dockerjava.cmd.swarm; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.ConflictException; -import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.api.model.PullResponseItem; +import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; import org.junit.After; import org.junit.Before; import org.junit.experimental.categories.Category; +import java.io.IOException; +import java.time.Duration; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.awaitility.Awaitility.await; import static org.junit.Assume.assumeThat; @Category({SwarmModeIntegration.class, Integration.class}) public abstract class SwarmCmdIT extends CmdIT { - protected DockerClient secondDockerClient; - private int numberOfDockersInDocker = 0; - private static final int PORT_START = 2378; + private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; + + private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "26.1.3-dind"; + private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; + private static final String NETWORK_NAME = "dind-network"; - private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; - private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; + + private final AtomicInteger numberOfDockersInDocker = new AtomicInteger(); + + private final Set startedContainerIds = new HashSet<>(); @Before - public void beforeTest() throws Exception { + public final void setUpMultiNodeSwarmCmdIT() { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); } - @Before - public void beforeMethod() { - leaveIfInSwarm(); + protected DockerClient startSwarm() { + DockerClient dockerClient; + try { + dockerClient = startDockerInDocker(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + dockerClient.initializeSwarmCmd(new SwarmSpec()).exec(); + return dockerClient; } @After - public void afterMethod() { - removeDockersInDocker(); - } - - protected void removeDockersInDocker() { - for (int i = 1; i <= numberOfDockersInDocker; i++) { + public final void tearDownMultiNodeSwarmCmdIT() { + for (String containerId : startedContainerIds) { try { - dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec(); + dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec(); } catch (NotFoundException e) { // container does not exist } @@ -66,75 +79,67 @@ protected void removeDockersInDocker() { } catch (NotFoundException e) { // network does not exist } - - numberOfDockersInDocker = 0; } - protected DockerClient startDockerInDocker() { - numberOfDockersInDocker++; - String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker; - - // Delete if already exists - try { - dockerRule.getClient().removeContainerCmd(name).withForce(true).exec(); - } catch (NotFoundException e) { - // container does not exist - } - + protected DockerClient startDockerInDocker() throws InterruptedException { // Create network if not already exists + DockerClient hostDockerClient = dockerRule.getClient(); try { - dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); + hostDockerClient.inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); } catch (NotFoundException e) { try { - dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec(); + hostDockerClient.createNetworkCmd().withName(NETWORK_NAME).exec(); } catch (ConflictException e2) { // already exists } } - dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) + try ( + ResultCallback.Adapter callback = hostDockerClient.pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) - .exec(new PullImageResultCallback()) - .awaitSuccess(); - - int port = PORT_START + (numberOfDockersInDocker - 1); - CreateContainerResponse response = dockerRule.getClient() - .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) - .withHostConfig(newHostConfig() - .withNetworkMode(NETWORK_NAME) - .withPortBindings(new PortBinding( - Ports.Binding.bindIpAndPort("127.0.0.1", port), - ExposedPort.tcp(2375))) - .withPrivileged(true)) - .withName(name) - .withAliases(name) - - .exec(); - - dockerRule.getClient().startContainerCmd(response.getId()).exec(); - - return initializeDockerClient(port); - } + .start() + ) { + callback.awaitCompletion(); + } catch (IOException e) { + throw new RuntimeException(e); + } - private DockerClient initializeDockerClient(int port) { - DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl("https://index.docker.io/v1/") - .withDockerHost("tcp://localhost:" + port).build(); - return DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory(getFactoryType() == FactoryType.NETTY ? new NettyDockerCmdExecFactory() : new JerseyDockerCmdExecFactory()) - .build(); + ExposedPort exposedPort = ExposedPort.tcp(2375); + CreateContainerResponse response = hostDockerClient + .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) + .withEntrypoint("dockerd") + .withCmd(Arrays.asList("--host=tcp://0.0.0.0:2375", "--host=unix:///var/run/docker.sock", "--tls=false")) + .withHostConfig(newHostConfig() + .withNetworkMode(NETWORK_NAME) + .withPortBindings(new PortBinding( + Ports.Binding.bindIp("127.0.0.1"), + exposedPort)) + .withPrivileged(true)) + .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet()) + .exec(); + + String containerId = response.getId(); + startedContainerIds.add(containerId); + + hostDockerClient.startContainerCmd(containerId).exec(); + + InspectContainerResponse inspectContainerResponse = hostDockerClient.inspectContainerCmd(containerId).exec(); + + Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0]; + + DockerClient dockerClient = initializeDockerClient(binding); + + await().pollDelay(Duration.ofSeconds(5)).atMost(10, TimeUnit.SECONDS).untilAsserted(() -> { + dockerClient.pingCmd().exec(); + }); + + return dockerClient; } - private void leaveIfInSwarm() { - try { - // force in case this is a swarm manager - dockerRule.getClient().leaveSwarmCmd().withForceEnabled(true).exec(); - } catch (NotAcceptableException e) { - // do nothing, node is not part of a swarm - } catch (DockerException ex) { - if (!ex.getMessage().contains("node is not part of a swarm")) { - throw ex; - } - } + private DockerClient initializeDockerClient(Ports.Binding binding) { + DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withRegistryUrl("https://index.docker.io/v1/") + .withDockerHost("tcp://" + binding).build(); + return createDockerClient(config); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java index 5886614dd..ea3818836 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java @@ -1,7 +1,7 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; import com.github.dockerjava.api.model.SwarmDispatcherConfig; @@ -22,11 +22,12 @@ public class UpdateSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecIT.class); + @Test public void updateSwarm() throws DockerException { - SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec"); + DockerClient dockerClient = startSwarm(); - SwarmSpec secondSpec = new SwarmSpec() - .withName("secondSpec") + SwarmSpec newSpec = new SwarmSpec() + .withName("default") .withDispatcher(new SwarmDispatcherConfig() .withHeartbeatPeriod(10000000L) ).withOrchestration(new SwarmOrchestration() @@ -40,33 +41,25 @@ public void updateSwarm() throws DockerException { .withLogEntriesForSlowFollowers(200) ).withTaskDefaults(new TaskDefaults()); - dockerRule.getClient().initializeSwarmCmd(firstSpec) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - LOG.info("Initialized swarm: {}", firstSpec.toString()); - - Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + Swarm swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); - assertThat(swarm.getSpec(), is(not(equalTo(secondSpec)))); + assertThat(swarm.getSpec(), is(not(equalTo(newSpec)))); - dockerRule.getClient().updateSwarmCmd(secondSpec) + dockerClient.updateSwarmCmd(newSpec) .withVersion(swarm.getVersion().getIndex()) .exec(); - LOG.info("Updated swarm: {}", secondSpec.toString()); + LOG.info("Updated swarm: {}", newSpec.toString()); - swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); - assertThat(swarm.getSpec(), is(equalTo(secondSpec))); + assertThat(swarm.getSpec(), is(equalTo(newSpec))); } - @Test(expected = NotAcceptableException.class) - public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm"); - - dockerRule.getClient().updateSwarmCmd(swarmSpec) - .withVersion(1l) + @Test(expected = DockerException.class) + public void updatingSwarmThrowsWhenNotInSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); + dockerClient.updateSwarmCmd(new SwarmSpec()) + .withVersion(1L) .exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java index b999e71e5..d26e051b1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java @@ -5,7 +5,6 @@ import com.github.dockerjava.api.model.SwarmNodeAvailability; import com.github.dockerjava.api.model.SwarmNodeSpec; import com.github.dockerjava.api.model.SwarmNodeState; -import com.github.dockerjava.api.model.SwarmSpec; import org.junit.Test; import java.util.List; @@ -16,17 +15,16 @@ public class UpdateSwarmNodeIT extends SwarmCmdIT { @Test public void testUpdateSwarmNode() { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); - List nodes = docker1.listSwarmNodesCmd().exec(); + DockerClient dockerClient = startSwarm(); + List nodes = dockerClient.listSwarmNodesCmd().exec(); assertThat(1, is(nodes.size())); SwarmNode node = nodes.get(0); assertThat(SwarmNodeState.READY, is(node.getStatus().getState())); //update the node availability SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE); - docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) + dockerClient.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) .withSwarmNodeSpec(nodeSpec).exec(); - nodes = docker1.listSwarmNodesCmd().exec(); + nodes = dockerClient.listSwarmNodesCmd().exec(); assertThat(nodes.size(), is(1)); assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index dc7c83a4e..c477320bf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -8,7 +8,6 @@ import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import com.google.common.collect.Lists; import org.junit.Test; @@ -16,34 +15,35 @@ import java.util.Arrays; import java.util.List; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; public class UpdateSwarmServiceIT extends SwarmCmdIT { @Test public void testUpdateServiceReplicate() { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); + DockerClient dockerClient = startSwarm(); //create network - String networkId = docker1.createNetworkCmd().withName("networkname").withDriver("overlay") + String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay") .withIpam(new Network.Ipam().withDriver("default")).exec().getId(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( - new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600"))); + new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")).withInit(true)); ServiceSpec serviceSpec = new ServiceSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1))) .withTaskTemplate(taskSpec) .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId))) .withName("worker"); - String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId(); - //list the service - List services = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); - assertThat(services.size(), is(1)); - Service service = services.get(0); - ServiceSpec updateServiceSpec = service.getSpec() + String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId(); + await().untilAsserted(() -> { + List services = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); + assertThat(services.size(), is(1)); + Service service = services.get(0); + ServiceSpec updateServiceSpec = service.getSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2))); - docker1.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); - //verify the replicate - Service updateService = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); - assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); + dockerClient.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); + //verify the replicate + Service updateService = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); + assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); + }); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index a8fdb89c6..6c7787caf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -1,10 +1,10 @@ package com.github.dockerjava.core; -import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; import com.google.common.io.Resources; -import org.apache.commons.lang.SerializationUtils; +import java.io.IOException; +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; import java.io.File; @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import java.util.UUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -22,17 +23,31 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class DefaultDockerClientConfigTest { public static final DefaultDockerClientConfig EXAMPLE_CONFIG = newExampleConfig(); + public static final DefaultDockerClientConfig EXAMPLE_CONFIG_FULLY_LOADED = newExampleConfigFullyLoaded(); private static DefaultDockerClientConfig newExampleConfig() { - String dockerCertPath = dockerCertPath(); + return new DefaultDockerClientConfig(URI.create("tcp://foo"), null, "dockerConfig", "apiVersion", "registryUrl", + "registryUsername", "registryPassword", "registryEmail", + new LocalDirectorySSLConfig(dockerCertPath)); + } - return new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + private static DefaultDockerClientConfig newExampleConfigFullyLoaded() { + try { + String dockerCertPath = dockerCertPath(); + String dockerConfig = "dockerConfig"; + DockerConfigFile loadedConfigFile = DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig); + return new DefaultDockerClientConfig(URI.create("tcp://foo"), loadedConfigFile, dockerConfig, "apiVersion", "registryUrl", + "registryUsername", "registryPassword", "registryEmail", new LocalDirectorySSLConfig(dockerCertPath)); + } catch (IOException exception) { + throw new RuntimeException(exception); + } } private static String homeDir() { @@ -44,12 +59,12 @@ private static String dockerCertPath() { } @Test - public void equals() throws Exception { + public void equals() { assertEquals(EXAMPLE_CONFIG, newExampleConfig()); } @Test - public void environmentDockerHost() throws Exception { + public void environmentDockerHost() { // given docker host in env Map env = new HashMap<>(); @@ -65,11 +80,60 @@ public void environmentDockerHost() throws Exception { // when you build a config DefaultDockerClientConfig config = buildConfig(env, systemProperties); - assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768")); + assertEquals(URI.create("tcp://baz:8768"), config.getDockerHost()); + } + + @Test + public void dockerContextFromConfig() { + // given home directory with docker contexts configured + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an empty environment + Map env = new HashMap<>(); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("unix:///configcontext.sock"), config.getDockerHost()); + } + + @Test + public void dockerContextFromEnvironmentVariable() { + // given home directory with docker contexts + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an environment variable that overrides docker context + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "envvarcontext"); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("unix:///envvarcontext.sock"), config.getDockerHost()); + } + + @Test + public void dockerContextWithDockerHostAndTLS() { + // given home directory with docker contexts + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an environment variable that overrides docker context + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "remote"); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost()); + assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig); + assertTrue("SSL directory is set", ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath().endsWith("dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker")); } @Test - public void environment() throws Exception { + public void environment() { // given a default config in env properties Map env = new HashMap<>(); @@ -87,7 +151,20 @@ public void environment() throws Exception { DefaultDockerClientConfig config = buildConfig(env, new Properties()); // then we get the example object - assertEquals(config, EXAMPLE_CONFIG); + assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config); + } + + @Test + public void emptyHost() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, " "); + + DefaultDockerClientConfig config = buildConfig(env, new Properties()); + + assertEquals( + DefaultDockerClientConfig.DEFAULT_DOCKER_HOST, + config.getDockerHost().toString() + ); } private DefaultDockerClientConfig buildConfig(Map env, Properties systemProperties) { @@ -95,7 +172,7 @@ private DefaultDockerClientConfig buildConfig(Map env, Propertie } @Test - public void defaults() throws Exception { + public void defaults() { // given default cert path Properties systemProperties = new Properties(); @@ -106,16 +183,16 @@ public void defaults() throws Exception { DefaultDockerClientConfig config = buildConfig(Collections. emptyMap(), systemProperties); // then the cert path is as expected - assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock")); - assertEquals(config.getRegistryUsername(), "someUserName"); - assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS); - assertEquals(config.getApiVersion(), RemoteApiVersion.unknown()); - assertEquals(config.getDockerConfigPath(), homeDir() + "/.docker"); + assertEquals(URI.create("unix:///var/run/docker.sock"), config.getDockerHost()); + assertEquals("someUserName", config.getRegistryUsername()); + assertEquals(AuthConfig.DEFAULT_SERVER_ADDRESS, config.getRegistryUrl()); + assertEquals(RemoteApiVersion.unknown(), config.getApiVersion()); + assertEquals(homeDir() + "/.docker", config.getDockerConfigPath()); assertNull(config.getSSLConfig()); } @Test - public void systemProperties() throws Exception { + public void systemProperties() { // given system properties based on the example Properties systemProperties = new Properties(); @@ -133,7 +210,7 @@ public void systemProperties() throws Exception { DefaultDockerClientConfig config = buildConfig(Collections. emptyMap(), systemProperties); // then it is the same as the example - assertEquals(config, EXAMPLE_CONFIG); + assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config); } @@ -146,35 +223,24 @@ public void serializableTest() { } @Test() - public void testSslContextEmpty() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + public void testSslContextEmpty() { + new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); } @Test() - public void testTlsVerifyAndCertPath() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + public void testTlsVerifyAndCertPath() { + new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", new LocalDirectorySSLConfig(dockerCertPath())); } - @Test(expected = DockerClientException.class) - public void testWrongHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); - } - - @Test() - public void testTcpHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); - } - @Test() - public void testUnixHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); + public void testAnyHostScheme() { + URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo"); + new DefaultDockerClientConfig(dockerHost, new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + null); } @Test @@ -206,10 +272,52 @@ public void withDockerTlsVerify() throws Exception { } @Test - public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException { + public void dockerHostSetExplicitlyOnSetter() { + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), new Properties()); + assertThat(builder.isDockerHostSetExplicitly(), is(false)); + + builder.withDockerHost("tcp://foo"); + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyOnSystemProperty() { + Properties systemProperties = new Properties(); + systemProperties.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo"); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), systemProperties); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyOnEnv() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo"); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties()); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyIfSetToDefaultByUser() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, DefaultDockerClientConfig.DEFAULT_DOCKER_HOST); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties()); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + + @Test + public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException, IOException { File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI()); + DockerConfigFile dockerConfigFile = + DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath()); DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create( - "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", + "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations(); @@ -222,10 +330,12 @@ public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException { } @Test - public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException { + public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException, IOException { File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v2").toURI()); + DockerConfigFile dockerConfigFile = + DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath()); DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create( - "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", + "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations(); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java index be0bfda8a..d826a98ce 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java @@ -34,7 +34,7 @@ public void testConcurrentClientBuilding() throws Exception { parallel(AMOUNT, runnable); // set contains all required unique instances - assertEquals(instances.size(), AMOUNT); + assertEquals(AMOUNT, instances.size()); } public static void parallel(int threads, final Runnable task) throws Exception { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java index 08f658d52..6ae88ffd1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java @@ -10,9 +10,10 @@ public class DockerClientImplTest { @Test - public void configuredInstanceAuthConfig() throws Exception { + public void configuredInstanceAuthConfig() { // given a config with null serverAddress - DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null); + DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), + new DockerConfigFile(), null, null, null, "", "", "", null); DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig); // when we get the auth config @@ -21,12 +22,12 @@ public void configuredInstanceAuthConfig() throws Exception { throw new AssertionError(); } catch (NullPointerException e) { // then we get a NPE with expected message - assertEquals(e.getMessage(), "Configured serverAddress is null."); + assertEquals("Configured serverAddress is null.", e.getMessage()); } } @Test - public void defaultInstanceAuthConfig() throws Exception { + public void defaultInstanceAuthConfig() { System.setProperty("user.home", "target/test-classes/someHomeDir"); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java new file mode 100644 index 000000000..463c63ffe --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java @@ -0,0 +1,25 @@ +package com.github.dockerjava.core; + +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; +import com.github.dockerjava.api.command.DockerCmdExecFactory; + +class DockerCmdExecFactoryDelegate extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { + + final DockerCmdExecFactory delegate; + + DockerCmdExecFactoryDelegate(DockerCmdExecFactory delegate) { + this.delegate = delegate; + } + + @Override + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return delegate; + } + + @Override + public void init(DockerClientConfig dockerClientConfig) { + if (delegate instanceof DockerClientConfigAware) { + ((DockerClientConfigAware) delegate).init(dockerClientConfig); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java index e3b21ad8d..76211fc55 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java @@ -13,7 +13,7 @@ import java.io.IOException; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DockerConfigFileTest { @Rule @@ -150,12 +150,26 @@ public void validDockerConfig() throws IOException { assertThat(runTest("validDockerConfig"), is(expected)); } + @Test + public void validDockerConfigWithCurrentContext() throws IOException { + DockerConfigFile expected = new DockerConfigFile(); + expected.setCurrentContext("expectedContext"); + + assertThat(runTest("validDockerConfigWithCurrentContext"), is(expected)); + } + @Test public void nonExistent() throws IOException { DockerConfigFile expected = new DockerConfigFile(); assertThat(runTest("idontexist"), is(expected)); } + @Test + public void validJsonAuthsNull() throws IOException { + DockerConfigFile expected = new DockerConfigFile(); + assertThat(runTest("validJsonAuthsNull"), is(expected)); + } + private DockerConfigFile runTest(String testFileName) throws IOException { return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath()); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java new file mode 100644 index 000000000..af606a5b1 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -0,0 +1,212 @@ +package com.github.dockerjava.core; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.DockerClientDelegate; +import com.github.dockerjava.api.command.CreateContainerCmd; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.CreateNetworkCmd; +import com.github.dockerjava.api.command.CreateNetworkResponse; +import com.github.dockerjava.api.command.CreateVolumeCmd; +import com.github.dockerjava.api.command.CreateVolumeResponse; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.cmd.CmdIT; +import com.github.dockerjava.utils.LogContainerTestCallback; +import org.junit.rules.ExternalResource; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.HashSet; +import java.util.Set; + +/** + * @author Kanstantsin Shautsou + */ +public class DockerRule extends ExternalResource { + public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class); + public static final String DEFAULT_IMAGE = "busybox:latest"; + + private DockerClient dockerClient; + + private final Set createdContainerIds = new HashSet<>(); + + private final Set createdNetworkIds = new HashSet<>(); + + private final Set createdVolumeNames = new HashSet<>(); + + private final DefaultDockerClientConfig config = config(); + + public DockerClient newClient() { + DockerClientImpl dockerClient = CmdIT.createDockerClient(config); + + dockerClient.withDockerCmdExecFactory( + new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) { + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec(); + return command -> { + CreateContainerResponse response = exec.exec(command); + createdContainerIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec(); + return command -> { + CreateNetworkResponse response = exec.exec(command); + createdNetworkIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec(); + return command -> { + CreateVolumeResponse response = exec.exec(command); + createdVolumeNames.add(response.getName()); + return response; + }; + } + } + ); + + return new DockerClientDelegate() { + @Override + protected DockerClient getDockerClient() { + return dockerClient; + } + }; + } + + public DefaultDockerClientConfig getConfig() { + return config; + } + + public DockerClient getClient() { + if (dockerClient != null) { + return dockerClient; + } + return this.dockerClient = newClient(); + } + + @Override + public Statement apply(Statement base, Description description) { + return super.apply(base, description); + } + + @Override + protected void before() throws Throwable { +// LOG.info("======================= BEFORETEST ======================="); + LOG.debug("Connecting to Docker server"); + + + try { + getClient().inspectImageCmd(DEFAULT_IMAGE).exec(); + } catch (NotFoundException e) { + LOG.info("Pulling image 'busybox'"); + // need to block until image is pulled completely + getClient().pullImageCmd("busybox") + .withTag("latest") + .start() + .awaitCompletion(); + } + +// assertThat(getClient(), notNullValue()); +// LOG.info("======================= END OF BEFORETEST =======================\n\n"); + } + + @Override + protected void after() { +// LOG.debug("======================= END OF AFTERTEST ======================="); + createdContainerIds.parallelStream().forEach(containerId -> { + try { + dockerClient.removeContainerCmd(containerId) + .withForce(true) + .withRemoveVolumes(true) + .exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove container {}", containerId, e); + } + }); + createdNetworkIds.parallelStream().forEach(networkId -> { + try { + dockerClient.removeNetworkCmd(networkId).exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove network {}", networkId, e); + } + }); + createdVolumeNames.parallelStream().forEach(volumeName -> { + try { + dockerClient.removeVolumeCmd(volumeName).exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove volume {}", volumeName, e); + } + }); + + try { + dockerClient.close(); + } catch (Exception e) { + LOG.warn("Failed to close the DockerClient", e); + } + } + + private static DefaultDockerClientConfig config() { + return config(null); + } + + public static DefaultDockerClientConfig config(String password) { + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(RemoteApiVersion.VERSION_1_44) + .withRegistryUrl("https://index.docker.io/v1/"); + if (password != null) { + builder = builder.withRegistryPassword(password); + } + + return builder.build(); + } + + public String buildImage(File baseDir) throws Exception { + return getClient().buildImageCmd(baseDir) + .withNoCache(true) + .start() + .awaitImageId(); + } + + public String containerLog(String containerId) throws Exception { + return getClient().logContainerCmd(containerId) + .withStdOut(true) + .exec(new LogContainerTestCallback()) + .awaitCompletion() + .toString(); + } + + public void ensureContainerRemoved(String container1Name) { + try { + getClient().removeContainerCmd(container1Name) + .withForce(true) + .withRemoveVolumes(true) + .exec(); + } catch (NotFoundException ex) { + // ignore + } + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java index b6dde97f5..11ea90e57 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java @@ -85,7 +85,7 @@ public static Object[][] getTestData() { public MatchTestCase testCase; @Test - public void testMatch() throws IOException { + public void testMatch() { String pattern = testCase.pattern; String s = testCase.s; if (GoLangFileMatch.IS_WINDOWS) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java index 234ed47a1..89ad131f6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java @@ -7,7 +7,7 @@ import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; import com.github.dockerjava.core.exception.InvalidRepositoryNameException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -21,7 +21,7 @@ public class NameParserTest { @Test - public void testValidateRepoName() throws Exception { + public void testValidateRepoName() { NameParser.validateRepoName("repository"); NameParser.validateRepoName("namespace/repository"); NameParser.validateRepoName("namespace-with-dashes/repository"); @@ -33,118 +33,159 @@ public void testValidateRepoName() throws Exception { } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEmpty() throws Exception { + public void testValidateRepoNameEmpty() { NameParser.validateRepoName(""); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameExceedsMaxLength() throws Exception { + public void testValidateRepoNameExceedsMaxLength() { NameParser.validateRepoName(StringUtils.repeat("repository", 255)); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithDash() throws Exception { + public void testValidateRepoNameEndWithDash() { NameParser.validateRepoName("repository-"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithDash() throws Exception { + public void testValidateRepoNameStartWithDash() { NameParser.validateRepoName("-repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithDot() throws Exception { + public void testValidateRepoNameEndWithDot() { NameParser.validateRepoName("repository."); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithDot() throws Exception { + public void testValidateRepoNameStartWithDot() { NameParser.validateRepoName(".repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithUnderscore() throws Exception { + public void testValidateRepoNameEndWithUnderscore() { NameParser.validateRepoName("repository_"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithUnderscore() throws Exception { + public void testValidateRepoNameStartWithUnderscore() { NameParser.validateRepoName("_repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameWithColon() throws Exception { + public void testValidateRepoNameWithColon() { NameParser.validateRepoName("repository:with:colon"); } @Test - public void testResolveSimpleRepositoryName() throws Exception { + public void testResolveSimpleRepositoryName() { HostnameReposName resolved = NameParser.resolveRepositoryName("repository"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespace() throws Exception { + public void testResolveRepositoryNameWithTag() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository@sha256:sha256"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithTagAndSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag@sha256:sha256"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithNamespace() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndSHA256() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndSHA256() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndHostname() { HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository"); - assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository")); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() { HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository@sha256:sha256"); - assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository")); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithNamespaceAndHostnameAndTag() { + HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag"); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); + } + @Test + public void testResolveRepositoryNameWithNamespaceAndHostnameAndTagAndSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag@sha256:sha256"); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); } @Test(expected = InvalidRepositoryNameException.class) - public void testResolveRepositoryNameWithIndex() throws Exception { + public void testResolveRepositoryNameWithIndex() { NameParser.resolveRepositoryName("index.docker.io/repository"); } @Test - public void testResolveReposTagWithoutTagSimple() throws Exception { + public void testResolveReposTagWithoutTagSimple() { ReposTag resolved = NameParser.parseRepositoryTag("repository"); - assertEquals(resolved, new ReposTag("repository", "")); + assertEquals(new ReposTag("repository", ""), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository"); - assertEquals(resolved, new ReposTag("namespace/repository", "")); + assertEquals(new ReposTag("namespace/repository", ""), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "")); + assertEquals(new ReposTag("localhost:5000/namespace/repository", ""), resolved); } @Test - public void testResolveReposTagWithTag() throws Exception { + public void testResolveReposTagWithTag() { ReposTag resolved = NameParser.parseRepositoryTag("repository:tag"); - assertEquals(resolved, new ReposTag("repository", "tag")); + assertEquals(new ReposTag("repository", "tag"), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository:tag"); - assertEquals(resolved, new ReposTag("namespace/repository", "tag")); + assertEquals(new ReposTag("namespace/repository", "tag"), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "tag")); + assertEquals(new ReposTag("localhost:5000/namespace/repository", "tag"), resolved); } @Test - public void testResolveReposTagWithSHA256() throws Exception { + public void testResolveReposTagWithSHA256() { ReposTag resolved = NameParser.parseRepositoryTag("repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("repository@sha256:sha256", "")); + assertEquals(new ReposTag("repository@sha256:sha256", ""), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("namespace/repository@sha256:sha256", "")); + assertEquals(new ReposTag("namespace/repository@sha256:sha256", ""), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository@sha256:sha256", "")); + assertEquals(new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""), resolved); + } + + @Test + public void testResolveReposTagWithTagAndSHA256() { + ReposTag resolved = NameParser.parseRepositoryTag("repository:tag@sha256:sha256"); + assertEquals(new ReposTag("repository:tag@sha256:sha256", ""), resolved); + + resolved = NameParser.parseRepositoryTag("namespace/repository:tag@sha256:sha256"); + assertEquals(new ReposTag("namespace/repository:tag@sha256:sha256", ""), resolved); + + resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag@sha256:sha256"); + assertEquals(new ReposTag("localhost:5000/namespace/repository:tag@sha256:sha256", ""), resolved); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java index a9446ffd4..06b825868 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java deleted file mode 100644 index a052e0d58..000000000 --- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java +++ /dev/null @@ -1,538 +0,0 @@ -package com.github.dockerjava.core; - -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.command.AuthCmd.Exec; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateImageResponse; -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateNetworkResponse; -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.CreateVolumeResponse; -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; -import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.command.WaitContainerCmd; - -import java.io.IOException; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.List; - -/** - * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution for the purpose of - * automatically cleanup. - * - * @author Marcus Linke - */ -public class TestDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { - - private List containerNames = new ArrayList<>(); - - private List imageNames = new ArrayList<>(); - - private List volumeNames = new ArrayList<>(); - - private List networkIds = new ArrayList<>(); - - private DockerCmdExecFactory delegate; - - public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) { - this.delegate = delegate; - } - - @Override - public void init(DockerClientConfig dockerClientConfig) { - if (delegate instanceof DockerClientConfigAware) { - ((DockerClientConfigAware) delegate).init(dockerClientConfig); - } - } - - @Override - public void close() throws IOException { - delegate.close(); - } - - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - return command -> { - CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command); - containerNames.add(createContainerResponse.getId()); - return createContainerResponse; - }; - } - - @Override - public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { - return command -> { - delegate.createRemoveContainerCmdExec().exec(command); - containerNames.remove(command.getContainerId()); - return null; - }; - } - - @Override - public CreateImageCmd.Exec createCreateImageCmdExec() { - return command -> { - CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command); - imageNames.add(createImageResponse.getId()); - return createImageResponse; - }; - } - - @Override - public LoadImageCmd.Exec createLoadImageCmdExec() { - return command -> { - delegate.createLoadImageCmdExec().exec(command); - return null; - }; - } - - @Override - public RemoveImageCmd.Exec createRemoveImageCmdExec() { - return command -> { - delegate.createRemoveImageCmdExec().exec(command); - imageNames.remove(command.getImageId()); - return null; - }; - } - - @Override - public BuildImageCmd.Exec createBuildImageCmdExec() { - return (command, resultCallback) -> { - // can't detect image id here so tagging it - String tag = command.getTag(); - if (tag == null || "".equals(tag.trim())) { - tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE); - command.withTag(tag); - } - delegate.createBuildImageCmdExec().exec(command, resultCallback); - imageNames.add(tag); - return null; - }; - } - - @Override - public Exec createAuthCmdExec() { - return delegate.createAuthCmdExec(); - } - - @Override - public InfoCmd.Exec createInfoCmdExec() { - return delegate.createInfoCmdExec(); - } - - @Override - public PingCmd.Exec createPingCmdExec() { - return delegate.createPingCmdExec(); - } - - @Override - public ExecCreateCmd.Exec createExecCmdExec() { - return delegate.createExecCmdExec(); - } - - @Override - public VersionCmd.Exec createVersionCmdExec() { - return delegate.createVersionCmdExec(); - } - - @Override - public PullImageCmd.Exec createPullImageCmdExec() { - return delegate.createPullImageCmdExec(); - } - - @Override - public PushImageCmd.Exec createPushImageCmdExec() { - return delegate.createPushImageCmdExec(); - } - - @Override - public SaveImageCmd.Exec createSaveImageCmdExec() { - return delegate.createSaveImageCmdExec(); - } - - @Override - public SearchImagesCmd.Exec createSearchImagesCmdExec() { - return delegate.createSearchImagesCmdExec(); - } - - @Override - public ListImagesCmd.Exec createListImagesCmdExec() { - return delegate.createListImagesCmdExec(); - } - - @Override - public InspectImageCmd.Exec createInspectImageCmdExec() { - return delegate.createInspectImageCmdExec(); - } - - @Override - public ListContainersCmd.Exec createListContainersCmdExec() { - return delegate.createListContainersCmdExec(); - } - - @Override - public StartContainerCmd.Exec createStartContainerCmdExec() { - return delegate.createStartContainerCmdExec(); - } - - @Override - public InspectContainerCmd.Exec createInspectContainerCmdExec() { - return delegate.createInspectContainerCmdExec(); - } - - @Override - public WaitContainerCmd.Exec createWaitContainerCmdExec() { - return delegate.createWaitContainerCmdExec(); - } - - @Override - public AttachContainerCmd.Exec createAttachContainerCmdExec() { - return delegate.createAttachContainerCmdExec(); - } - - @Override - public ExecStartCmd.Exec createExecStartCmdExec() { - return delegate.createExecStartCmdExec(); - } - - @Override - public InspectExecCmd.Exec createInspectExecCmdExec() { - return delegate.createInspectExecCmdExec(); - } - - @Override - public LogContainerCmd.Exec createLogContainerCmdExec() { - return delegate.createLogContainerCmdExec(); - } - - @Override - public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { - return delegate.createCopyFileFromContainerCmdExec(); - } - - @Override - public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { - return delegate.createCopyArchiveFromContainerCmdExec(); - } - - @Override - public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { - return delegate.createCopyArchiveToContainerCmdExec(); - } - - @Override - public StopContainerCmd.Exec createStopContainerCmdExec() { - return delegate.createStopContainerCmdExec(); - } - - @Override - public ContainerDiffCmd.Exec createContainerDiffCmdExec() { - return delegate.createContainerDiffCmdExec(); - } - - @Override - public KillContainerCmd.Exec createKillContainerCmdExec() { - return delegate.createKillContainerCmdExec(); - } - - @Override - public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { - return delegate.createUpdateContainerCmdExec(); - } - - @Override - public RenameContainerCmd.Exec createRenameContainerCmdExec() { - return delegate.createRenameContainerCmdExec(); - } - - @Override - public RestartContainerCmd.Exec createRestartContainerCmdExec() { - return delegate.createRestartContainerCmdExec(); - } - - @Override - public CommitCmd.Exec createCommitCmdExec() { - return delegate.createCommitCmdExec(); - } - - @Override - public TopContainerCmd.Exec createTopContainerCmdExec() { - return delegate.createTopContainerCmdExec(); - } - - @Override - public TagImageCmd.Exec createTagImageCmdExec() { - return delegate.createTagImageCmdExec(); - } - - @Override - public PauseContainerCmd.Exec createPauseContainerCmdExec() { - return delegate.createPauseContainerCmdExec(); - } - - @Override - public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { - return delegate.createUnpauseContainerCmdExec(); - } - - @Override - public EventsCmd.Exec createEventsCmdExec() { - return delegate.createEventsCmdExec(); - } - - @Override - public StatsCmd.Exec createStatsCmdExec() { - return delegate.createStatsCmdExec(); - } - - @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - return command -> { - CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command); - volumeNames.add(command.getName()); - return result; - }; - } - - @Override - public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { - return delegate.createInspectVolumeCmdExec(); - } - - @Override - public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { - return command -> { - delegate.createRemoveVolumeCmdExec().exec(command); - volumeNames.remove(command.getName()); - return null; - }; - } - - @Override - public ListVolumesCmd.Exec createListVolumesCmdExec() { - return delegate.createListVolumesCmdExec(); - } - - @Override - public ListNetworksCmd.Exec createListNetworksCmdExec() { - return delegate.createListNetworksCmdExec(); - } - - @Override - public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { - return delegate.createInspectNetworkCmdExec(); - } - - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - - return command -> { - CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command); - networkIds.add(result.getId()); - return result; - }; - } - - @Override - public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { - return command -> { - delegate.createRemoveNetworkCmdExec().exec(command); - networkIds.remove(command.getNetworkId()); - return null; - }; - } - - @Override - public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { - return delegate.createConnectToNetworkCmdExec(); - } - - @Override - public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { - return delegate.createDisconnectFromNetworkCmdExec(); - } - - // swarm - @Override - public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { - return delegate.createInitializeSwarmCmdExec(); - } - - @Override - public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { - return delegate.createInspectSwarmCmdExec(); - } - - @Override - public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { - return delegate.createJoinSwarmCmdExec(); - } - - @Override - public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { - return delegate.createLeaveSwarmCmdExec(); - } - - @Override - public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { - return delegate.createUpdateSwarmCmdExec(); - } - - // services - @Override - public ListServicesCmd.Exec createListServicesCmdExec() { - return delegate.createListServicesCmdExec(); - } - - @Override - public CreateServiceCmd.Exec createCreateServiceCmdExec() { - return delegate.createCreateServiceCmdExec(); - } - - @Override - public InspectServiceCmd.Exec createInspectServiceCmdExec() { - return delegate.createInspectServiceCmdExec(); - } - - @Override - public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { - return delegate.createUpdateServiceCmdExec(); - } - - @Override - public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { - return delegate.createRemoveServiceCmdExec(); - } - - @Override - public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { - return delegate.logSwarmObjectExec(endpoint); - } - - // nodes - @Override - public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { - return delegate.listSwarmNodeCmdExec(); - } - - @Override - public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { - return delegate.inspectSwarmNodeCmdExec(); - } - - @Override - public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { - return delegate.removeSwarmNodeCmdExec(); - } - - @Override - public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { - return delegate.updateSwarmNodeCmdExec(); - } - - @Override - public ListTasksCmd.Exec listTasksCmdExec() { - return delegate.listTasksCmdExec(); - } - - @Override - public PruneCmd.Exec pruneCmdExec() { - return delegate.pruneCmdExec(); - } - - @Override - public ListSecretsCmd.Exec createListSecretsCmdExec() { - return delegate.createListSecretsCmdExec(); - } - - @Override - public CreateSecretCmd.Exec createCreateSecretCmdExec() { - return delegate.createCreateSecretCmdExec(); - } - - @Override - public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { - return delegate.createRemoveSecretCmdExec(); - } - - public List getContainerNames() { - return new ArrayList<>(containerNames); - } - - public List getImageNames() { - return new ArrayList<>(imageNames); - } - - public List getVolumeNames() { - return new ArrayList<>(volumeNames); - } - - public List getNetworkIds() { - return new ArrayList<>(networkIds); - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java deleted file mode 100644 index f4d790e0e..000000000 --- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Created on 16.02.2016 - */ -package com.github.dockerjava.core.async; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.model.PullResponseItem; -import com.github.dockerjava.test.serdes.JSONTestHelper; -import org.junit.Test; - -import java.io.ByteArrayInputStream; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertFalse; - - -/** - * - * @author Marcus Linke - * - */ -public class JsonStreamProcessorTest { - - @Test - public void processEmptyJson() throws Exception { - - InputStream response = new ByteArrayInputStream("{}".getBytes()); - - JsonStreamProcessor jsonStreamProcessor = new JsonStreamProcessor<>( - JSONTestHelper.getMapper(), PullResponseItem.class); - - final List completed = new ArrayList<>(); - - jsonStreamProcessor.processResponseStream(response, new ResultCallback() { - - @Override - public void close() throws IOException { - } - - @Override - public void onStart(Closeable closeable) { - } - - @Override - public void onNext(PullResponseItem object) { - assertFalse("onNext called for empty json", true); - } - - @Override - public void onError(Throwable throwable) { - } - - @Override - public void onComplete() { - completed.add(true); - } - }); - - assertFalse("Stream processing not completed", completed.isEmpty()); - } - -} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java index b17947c30..913d1758b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java @@ -1,10 +1,10 @@ package com.github.dockerjava.core.command; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Image; -import com.github.dockerjava.core.command.BuildImageResultCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public void open() throws Exception { LOGGER.info("building {}", directory); client.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true) - .exec(new BuildImageResultCallback()).awaitImageId(); + .start().awaitImageId(); Image lastCreatedImage = client.listImagesCmd().exec().get(0); @@ -68,7 +68,7 @@ public void close() throws Exception { LOGGER.info("removing repository {}", repository); try { client.removeImageCmd(repository).withForce(true).exec(); - } catch (NotFoundException | InternalServerErrorException e) { + } catch (DockerException e) { LOGGER.info("ignoring {}", e.getMessage()); } repository = null; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java index 096d616ca..16c456164 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core.command; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; import com.github.dockerjava.core.DockerClientBuilder; @@ -46,7 +47,7 @@ public void canCloseFrameReaderAndReadExpectedLines() throws Exception { // wait for the container to be successfully executed int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()) - .exec(new WaitContainerResultCallback()).awaitStatusCode(); + .start().awaitStatusCode(); assertEquals(0, exitCode); final List loggingFrames = getLoggingFrames(); @@ -96,7 +97,7 @@ public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception { } - public static class FrameReaderITestCallback extends LogContainerResultCallback { + public static class FrameReaderITestCallback extends ResultCallback.Adapter { public List frames = new ArrayList<>(); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java index e8adff20b..580e278f4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java @@ -34,7 +34,7 @@ public void endOfStreamReturnsNull() throws Exception { @Test public void stdInBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDIN, new byte[0])); + assertEquals(new Frame(StreamType.STDIN, new byte[0]), nextFrame(0, 0, 0, 0, 0, 0, 0, 0)); } private Frame nextFrame(int... bytes) throws IOException { @@ -44,12 +44,12 @@ private Frame nextFrame(int... bytes) throws IOException { @Test public void stdOutBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDOUT, new byte[0])); + assertEquals(new Frame(StreamType.STDOUT, new byte[0]), nextFrame(1, 0, 0, 0, 0, 0, 0, 0)); } @Test public void stdErrBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDERR, new byte[0])); + assertEquals(new Frame(StreamType.STDERR, new byte[0]), nextFrame(2, 0, 0, 0, 0, 0, 0, 0)); } private void setBytes(int... bytes) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java index 28818d24c..c29cedcf9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java @@ -11,6 +11,8 @@ import java.nio.file.Paths; import java.security.KeyStore; import java.security.Security; +import java.security.cert.Certificate; +import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -86,6 +88,20 @@ public void readMultipleCaCerts() throws Exception { assertThat(keyStore.isCertificateEntry("ca-2"), is(true)); } + @Test + public void readCert() throws Exception { + String certpem = readFileAsString("caTest/single_ca.pem"); + List certs = CertificateUtils.loadCertificates(certpem); + assertThat(certs.size(), is(1)); + } + + @Test + public void readMultipleCerts() throws Exception { + String certpem = readFileAsString("caTest/multiple_ca.pem"); + List certs = CertificateUtils.loadCertificates(certpem); + assertThat(certs.size(), is(2)); + } + private String readFileAsString(String path) throws IOException { return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath()))); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java index 720441e20..f15085d1c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java @@ -241,7 +241,7 @@ private static void assertTarArchiveEntryIsExecutableFile(File archive, String f TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName); assertNotNull(tarArchiveEntry); assertTrue(tarArchiveEntry.isFile()); - assertEquals("should be executable", (tarArchiveEntry.getMode() & 0755), 0755); + assertEquals("should be executable", 0755, (tarArchiveEntry.getMode() & 0755)); } private static void assertTarArchiveEntryIsSymlink(File archive, String fileName, String expectedTarget) throws IOException { diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java index 011ee2885..2971d7bf3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java @@ -1,6 +1,7 @@ package com.github.dockerjava.junit; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.core.DockerRule; import static com.github.dockerjava.utils.TestUtils.isSwarm; import static org.junit.Assume.assumeFalse; diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java index bc71b7dfd..d0c2a22e6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java @@ -2,6 +2,7 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Volume; +import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.core.RemoteApiVersion; import org.hamcrest.CustomTypeSafeMatcher; import org.hamcrest.Description; diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java deleted file mode 100644 index c178700cc..000000000 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.github.dockerjava.junit; - -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.cmd.CmdIT; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; -import com.github.dockerjava.utils.LogContainerTestCallback; -import org.junit.rules.ExternalResource; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY; - -/** - * @author Kanstantsin Shautsou - */ -public class DockerRule extends ExternalResource { - public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class); - public static final String DEFAULT_IMAGE = "busybox:latest"; - - private DockerClient nettyClient; - private DockerClient jerseyClient; - - private CmdIT cmdIT; - - public DockerRule(CmdIT cmdIT) { - this.cmdIT = cmdIT; - } - - - public DockerClient getClient() { - if (cmdIT.getFactoryType() == NETTY) { - if (nettyClient == null) { - nettyClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory((new NettyDockerCmdExecFactory()) - .withConnectTimeout(10 * 1000)) - .build(); - } - - return nettyClient; - } else if (cmdIT.getFactoryType() == JERSEY) { - if (jerseyClient == null) { - jerseyClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory((new JerseyDockerCmdExecFactory()) - .withConnectTimeout(10 * 1000)) - .build(); - } - return jerseyClient; - } - - throw new IllegalStateException("Why factory type is not set?"); - } - - @Override - public Statement apply(Statement base, Description description) { - return super.apply(base, description); - } - - @Override - protected void before() throws Throwable { -// LOG.info("======================= BEFORETEST ======================="); - LOG.debug("Connecting to Docker server"); - - - try { - getClient().inspectImageCmd(DEFAULT_IMAGE).exec(); - } catch (NotFoundException e) { - LOG.info("Pulling image 'busybox'"); - // need to block until image is pulled completely - getClient().pullImageCmd("busybox") - .withTag("latest") - .exec(new PullImageResultCallback()) - .awaitSuccess(); - } - -// assertThat(getClient(), notNullValue()); -// LOG.info("======================= END OF BEFORETEST =======================\n\n"); - } - - @Override - protected void after() { -// LOG.debug("======================= END OF AFTERTEST ======================="); - } - - private static DefaultDockerClientConfig config() { - return config(null); - } - - public static DefaultDockerClientConfig config(String password) { - DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl("https://index.docker.io/v1/"); - if (password != null) { - builder = builder.withRegistryPassword(password); - } - - return builder.build(); - } - - public String buildImage(File baseDir) throws Exception { - return getClient().buildImageCmd(baseDir) - .withNoCache(true) - .exec(new BuildImageResultCallback()) - .awaitImageId(); - } - - public String containerLog(String containerId) throws Exception { - return getClient().logContainerCmd(containerId) - .withStdOut(true) - .exec(new LogContainerTestCallback()) - .awaitCompletion() - .toString(); - } - - public String getKind() { - if (cmdIT.getFactoryType() == NETTY) { - return "netty"; - } else if (cmdIT.getFactoryType() == JERSEY) { - return "jersey"; - } - - return "default"; - } - - public void ensureContainerRemoved(String container1Name) { - try { - getClient().removeContainerCmd(container1Name) - .withForce(true) - .withRemoveVolumes(true) - .exec(); - } catch (NotFoundException ex) { - // ignore - } - } - - public void ensureImageRemoved(String imageId) { - try { - getClient().removeImageCmd(imageId) - .withForce(true) - .exec(); - } catch (NotFoundException ex) { - // ignore - } - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java new file mode 100644 index 000000000..327bfc941 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java @@ -0,0 +1,119 @@ +package com.github.dockerjava.junit; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectImageResponse; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.ExposedPort; +import com.github.dockerjava.api.model.PortBinding; +import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.cmd.CmdIT; +import com.github.dockerjava.core.DockerRule; +import org.junit.rules.ExternalResource; + +import java.io.File; +import java.util.concurrent.TimeUnit; + +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + +public class PrivateRegistryRule extends ExternalResource { + + private final DockerClient dockerClient; + + private AuthConfig authConfig; + + private String containerId; + + public PrivateRegistryRule() { + this.dockerClient = CmdIT.createDockerClient(DockerRule.config(null)); + } + + public AuthConfig getAuthConfig() { + return authConfig; + } + + public String createPrivateImage(String tagName) throws InterruptedException { + String imgNameWithTag = createTestImage(tagName); + + dockerClient.pushImageCmd(imgNameWithTag) + .withAuthConfig(authConfig) + .start() + .awaitCompletion(30, TimeUnit.SECONDS); + + dockerClient.removeImageCmd(imgNameWithTag).exec(); + + //ensures that the image is available, the private registry needs some time to reflect a tag push + Thread.sleep(5000); + + return imgNameWithTag; + } + + public String createTestImage(String tagName) { + String imgName = authConfig.getRegistryAddress() + "/busybox"; + + dockerClient.tagImageCmd(DEFAULT_IMAGE, imgName, tagName).exec(); + return imgName + ":" + tagName; + } + + /** + * Starts a local test registry when it is not already started and returns the auth configuration for it + * This method is synchronized so that only the first invocation starts the registry + */ + @Override + protected void before() throws Throwable { + + int port = 5050; + + String imageName = "private-registry-image"; + + File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile()); + + String registryImageId = dockerClient.buildImageCmd(baseDir) + .withNoCache(true) + .start() + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + + dockerClient.tagImageCmd(registryImageId, imageName, "2") + .withForce().exec(); + + // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth + CreateContainerResponse testregistry = dockerClient + .createContainerCmd(imageName + ":2") + .withHostConfig(newHostConfig() + .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))) + .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", + "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug", + "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key") + .exec(); + + containerId = testregistry.getId(); + dockerClient.startContainerCmd(containerId).exec(); + + // wait for registry to boot + Thread.sleep(3000); + + // credentials as configured in /auth/htpasswd + authConfig = new AuthConfig() + .withUsername("testuser") + .withPassword("testpassword") + .withRegistryAddress("localhost:" + port); + } + + @Override + protected void after() { + if (containerId != null) { + dockerClient.removeContainerCmd(containerId) + .withForce(true) + .withRemoveVolumes(true) + .exec(); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java index 7585a7534..03019f383 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java @@ -43,7 +43,7 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception Builder configBuilder = new DefaultDockerClientConfig.Builder() .withDockerTlsVerify(false) .withDockerHost("tcp://localhost:" + dockerPort) - .withApiVersion("1.23"); + .withApiVersion("1.44"); DockerClient client = DockerClientBuilder.getInstance(configBuilder) .withDockerCmdExecFactory(factory) @@ -56,8 +56,8 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception List requests = server.getRequests(); - assertEquals(requests.size(), 1); - assertEquals(requests.get(0).uri(), "/v1.23/version"); + assertEquals(1, requests.size()); + assertEquals("/v1.44/version", requests.get(0).uri()); } finally { server.stop(); } @@ -83,8 +83,8 @@ public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Except List requests = server.getRequests(); - assertEquals(requests.size(), 1); - assertEquals(requests.get(0).uri(), "/version"); + assertEquals(1, requests.size()); + assertEquals("/version", requests.get(0).uri()); } finally { server.stop(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java index adef3268f..4e7bb1da2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java @@ -17,12 +17,12 @@ public class NettyWebTargetTest { private ChannelProvider channelProvider; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); } @Test - public void verifyImmutability() throws Exception { + public void verifyImmutability() { NettyWebTarget emptyWebTarget = new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"); NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592") @@ -31,12 +31,12 @@ public void verifyImmutability() throws Exception { NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach") .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true"); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"), emptyWebTarget); + assertEquals(emptyWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY")); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach") - .queryParam("logs", "true"), initWebTarget); + assertEquals(initWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach") + .queryParam("logs", "true")); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") - .queryParam("stdin", "true"), anotherWebTarget); + assertEquals(anotherWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") + .queryParam("stdin", "true")); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java index 98161b072..ef903f942 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java @@ -87,7 +87,7 @@ public void channelRead0rawStream() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "RAW: "); + assertEquals("RAW: ", responseHandler.frames.get(0).toString()); } @Test @@ -117,7 +117,7 @@ public void channelRead0stdIn() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDIN: "); + assertEquals("STDIN: ", responseHandler.frames.get(0).toString()); } @Test @@ -132,7 +132,7 @@ public void channelRead0stdOut() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: "); + assertEquals("STDOUT: ", responseHandler.frames.get(0).toString()); } @Test @@ -147,7 +147,7 @@ public void channelRead0stdErr() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDERR: "); + assertEquals("STDERR: ", responseHandler.frames.get(0).toString()); } @Test @@ -162,7 +162,7 @@ public void channelRead0largePayload() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: "); + assertEquals("STDOUT: ", responseHandler.frames.get(0).toString()); } @Test @@ -179,6 +179,6 @@ public void exceptionCaught() throws Exception { objectUnderTest.exceptionCaught(Mockito.mock(ChannelHandlerContext.class), throwable); // Assert result - assertEquals(responseHandler.exceptions.get(0).getCause(), exception); + assertEquals(exception, responseHandler.exceptions.get(0).getCause()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java index 57913313f..9a2492062 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java @@ -32,10 +32,10 @@ public void testNoBytesSkipped() throws Exception { ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); ByteBuf buffer = generateByteBuf(); ByteBuf readBuffer = buffer.copy(); - assertEquals(buffer.refCnt(), 1); + assertEquals(1, buffer.refCnt()); streamHandler.channelRead(ctx, buffer); streamHandler.channelInactive(ctx); - assertEquals(buffer.refCnt(), 0); + assertEquals(0, buffer.refCnt()); try (InputStream inputStream = callback.getInputStream()) { assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(readBuffer))); } @@ -49,10 +49,10 @@ public void testReadByteByByte() throws Exception { ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); ByteBuf buffer = generateByteBuf(); ByteBuf readBuffer = buffer.copy(); - assertEquals(buffer.refCnt(), 1); + assertEquals(1, buffer.refCnt()); streamHandler.channelRead(ctx, buffer); streamHandler.channelInactive(ctx); - assertEquals(buffer.refCnt(), 0); + assertEquals(0, buffer.refCnt()); try (InputStream inputStream = callback.getInputStream()) { for (int i = 0; i < readBuffer.readableBytes(); i++) { int b = inputStream.read(); @@ -93,7 +93,7 @@ public void testCloseResponseStreamOnWrite() throws Exception { }); firstWrite.await(); - assertTrue(inputStream.available() > 0); + assertTrue(inputStream.read() != -1); // second write should have started Thread.sleep(500L); diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java index 24d7b1677..0c03bdcc2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java +++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; import org.apache.commons.io.IOUtils; import java.io.IOException; @@ -33,7 +33,16 @@ */ public class JSONTestHelper { - static final ObjectMapper MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + static final ObjectMapper MAPPER; + + static { + try { + MAPPER = DockerClientConfig.getDefaultObjectMapper(); + } catch (Throwable e) { + e.printStackTrace(); + throw e; + } + } /** * Reads JSON String from the specified resource diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java index cbb5a2f17..e21a55465 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java @@ -1,7 +1,7 @@ package com.github.dockerjava.utils; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.command.LogContainerResultCallback; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ /** * @author Kanstantsin Shautsou */ -public class LogContainerTestCallback extends LogContainerResultCallback { +public class LogContainerTestCallback extends ResultCallback.Adapter { protected final StringBuffer log = new StringBuffer(); List collectedFrames = new ArrayList<>(); diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java deleted file mode 100644 index 614a16cc6..000000000 --- a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.github.dockerjava.utils; - -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectImageResponse; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.junit.DockerRule; - -import java.io.File; -import java.util.concurrent.TimeUnit; - -import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -public class RegistryUtils { - - private static AuthConfig privateRegistryAuthConfig; - - /** - * Starts a local test registry when it is not already started and returns the auth configuration for it - * This method is synchronized so that only the first invocation starts the registry - * @return The auth configuration for the started private docker registry - * @throws Exception - */ - public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClient) throws Exception { - if (privateRegistryAuthConfig == null) { - int port = 5050; - - String containerName = "private-registry"; - String imageName = "private-registry-image"; - - File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile()); - - try { - dockerClient.removeContainerCmd(containerName) - .withForce(true) - .withRemoveVolumes(true) - .exec(); - } catch (NotFoundException ex) { - // ignore - } - - String registryImageId = dockerClient.buildImageCmd(baseDir) - .withNoCache(true) - .exec(new BuildImageResultCallback()) - .awaitImageId(); - - InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec(); - assertThat(inspectImageResponse, not(nullValue())); - DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString()); - - dockerClient.tagImageCmd(registryImageId, imageName, "2") - .withForce().exec(); - - // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth - CreateContainerResponse testregistry = dockerClient - .createContainerCmd(imageName + ":2") - .withName(containerName) - .withHostConfig(newHostConfig() - .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))) - .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", - "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug", - "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key") - .exec(); - - dockerClient.startContainerCmd(testregistry.getId()).exec(); - - // wait for registry to boot - Thread.sleep(3000); - - // credentials as configured in /auth/htpasswd - privateRegistryAuthConfig = new AuthConfig() - .withUsername("testuser") - .withPassword("testpassword") - .withRegistryAddress("localhost:" + port); - } - - return privateRegistryAuthConfig; - } - - public static String createPrivateImage(DockerRule dockerRule, String tagName) throws InterruptedException { - if (privateRegistryAuthConfig == null) - throw new IllegalStateException("Ensure that you have invoked runPrivateRegistry beforehand."); - - String imgNameWithTag = createTestImage(dockerRule, tagName); - - dockerRule.getClient().pushImageCmd(imgNameWithTag) - .withAuthConfig(privateRegistryAuthConfig) - .exec(new PushImageResultCallback()) - .awaitCompletion(30, TimeUnit.SECONDS); - - dockerRule.getClient().removeImageCmd(imgNameWithTag) - .exec(); - - //ensures that the image is available, the private registry needs some time to reflect a tag push - Thread.sleep(5000); - - return imgNameWithTag; - } - - public static String createTestImage(DockerRule dockerRule, String tagName) { - String tag = dockerRule.getKind() + "-" + tagName; - String imgName = privateRegistryAuthConfig.getRegistryAddress() + "/busybox"; - String imgNameWithTag = imgName + ":" + tag; - - dockerRule.getClient().tagImageCmd(DEFAULT_IMAGE, imgName, tag) - .exec(); - return imgNameWithTag; - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java index 35ece680f..2a56333f1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java @@ -1,5 +1,6 @@ package com.github.dockerjava.utils; +import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; @@ -8,7 +9,7 @@ public class TestResources { private TestResources() { } - public static Path getApiImagesLoadTestTarball() { - return Paths.get("src/test/resources/api/images/load/image.tar"); + public static Path getApiImagesLoadTestTarball() throws URISyntaxException { + return Paths.get(ClassLoader.getSystemResource("api/images/load/image.tar").toURI()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java index 87833343b..eb3af8deb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java @@ -5,7 +5,7 @@ import com.github.dockerjava.core.RemoteApiVersion; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh index 88b444bf0..370cda203 100644 --- a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh +++ b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh @@ -1,2 +1,2 @@ #!/bin/sh -while sleep 2; do echo stdout && echo stderr >&2; done \ No newline at end of file +echo stdout && echo stderr >&2 diff --git a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile index 4fbfa3236..3036dbbe6 100644 --- a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile +++ b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile @@ -2,9 +2,9 @@ FROM busybox:latest # Copy testrun.sh files into the container -ADD http://www.example.com/index.html /tmp/some.html +ADD https://www.example.com/ /tmp/some.html ADD ./testrun.sh /tmp/ RUN mkdir -p /usr/local/bin RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh -CMD ["testrun.sh"] \ No newline at end of file +CMD ["testrun.sh"] diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json index 2f3428d7a..688ea2689 100644 --- a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json @@ -6,6 +6,7 @@ "postgres" ], "SizeRootFs" : null, + "SizeRw" : null, "HostConfig" : { "KernelMemory" : 0, "MemorySwappiness" : -1, diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json @@ -0,0 +1 @@ +{} diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json new file mode 100644 index 000000000..edeaedc7a --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json @@ -0,0 +1,5 @@ +{ + "Warnings": [ + "Published ports are discarded when using host network mode" + ] +} diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json new file mode 100644 index 000000000..ae318e29d --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json @@ -0,0 +1 @@ +{"status":"Already exists"} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json new file mode 100644 index 000000000..5bb2ebebe --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json @@ -0,0 +1,4 @@ +{ + "auths": {}, + "currentContext": "configcontext" +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json new file mode 100644 index 000000000..c6456d6b8 --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json @@ -0,0 +1,12 @@ +{ + "Name": "envvarcontext", + "Metadata": { + "Description": "envvarcontext" + }, + "Endpoints": { + "docker": { + "Host": "unix:///envvarcontext.sock", + "SkipTLSVerify": false + } + } +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json new file mode 100644 index 000000000..a4ff5b460 --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json @@ -0,0 +1,15 @@ +{ + "Name": "remote", + "Metadata": { + "Description": "remote" + }, + "Endpoints": { + "docker": { + "Host": "tcp://remote:2376", + "SkipTLSVerify": false + } + }, + "Storage": { + "TLSPath": "target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist" + } +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json new file mode 100644 index 000000000..adff3b1c9 --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json @@ -0,0 +1,12 @@ +{ + "Name": "configcontext", + "Metadata": { + "Description": "configcontext" + }, + "Endpoints": { + "docker": { + "Host": "unix:///configcontext.sock", + "SkipTLSVerify": false + } + } +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem new file mode 100644 index 000000000..e69de29bb diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem new file mode 100644 index 000000000..e69de29bb diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem new file mode 100644 index 000000000..e69de29bb diff --git a/docker-java/src/test/resources/logback.xml b/docker-java/src/test/resources/logback.xml index b4309b868..8fb1a7a6d 100644 --- a/docker-java/src/test/resources/logback.xml +++ b/docker-java/src/test/resources/logback.xml @@ -7,13 +7,14 @@ - - - + + + + - \ No newline at end of file + diff --git a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json index 159e62da6..51329bb63 100644 --- a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json +++ b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json @@ -10,6 +10,7 @@ "Created": 1455662451, "Ports": [], "SizeRootFs": 1113554, + "SizeRw": 0, "Labels": {}, "Status": "Up Less than a second", "HostConfig": { diff --git a/docker-java/src/test/resources/samples/1.22/images/history/history.json b/docker-java/src/test/resources/samples/1.22/images/history/history.json new file mode 100644 index 000000000..a38da2d8f --- /dev/null +++ b/docker-java/src/test/resources/samples/1.22/images/history/history.json @@ -0,0 +1,32 @@ +[ + { + "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710", + "Created": 1398108230, + "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /", + "Tags": [ + "ubuntu:lucid", + "ubuntu:10.04" + ], + "Size": 182964289, + "Comment": "" + }, + { + "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8", + "Created": 1398108222, + "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/", + "Tags": [], + "Size": 0, + "Comment": "" + }, + { + "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158", + "Created": 1371157430, + "CreatedBy": "", + "Tags": [ + "scratch12:latest", + "scratch:latest" + ], + "Size": 0, + "Comment": "Imported from -" + } +] diff --git a/docker-java/src/test/resources/someHomeDir/.docker/config.json b/docker-java/src/test/resources/someHomeDir/.docker/config.json index 630394039..02ed0cf7f 100644 --- a/docker-java/src/test/resources/someHomeDir/.docker/config.json +++ b/docker-java/src/test/resources/someHomeDir/.docker/config.json @@ -1,9 +1,9 @@ { "auths":{ "https://index.docker.io/v1/":{ - "auth":"XXXX=", + "auth":"dXNlcm5hbWU6cGFzc3dvcmQ=", "email":"foo.bar@test.com" } } -} \ No newline at end of file +} diff --git a/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json new file mode 100644 index 000000000..8c5963f87 --- /dev/null +++ b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json @@ -0,0 +1,4 @@ +{ + "auths": {}, + "currentContext": "expectedContext" +} diff --git a/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json new file mode 100644 index 000000000..d104c357c --- /dev/null +++ b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json @@ -0,0 +1,9 @@ +{ + "auths": null, + "credsStore": "desktop", + "plugins": { + "-x-cli-hints": { + "enabled": "true" + } + } +} diff --git a/docker-java/template.mf b/docker-java/template.mf index 274e6f917..2ce26d092 100644 --- a/docker-java/template.mf +++ b/docker-java/template.mf @@ -13,7 +13,7 @@ Import-Template: javax.ws.rs.*;version="[2.0.0, 2.1.0)", org.apache.commons.compress.*;version="${commons-compress.version:short}", org.apache.commons.io.*;version="${commons-io.version:short}", - org.apache.commons.lang.*;version="${commons-lang.version:short}", + org.apache.commons.lang3.*;version="${commons-lang3.version:short}", org.apache.http.*;version="[4.4.0, 4.6.0)", org.bouncycastle.*;version="${bouncycastle.version:short}", org.glassfish.jersey.*;version="${jersey.version:default}", diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 000000000..4b8ef0798 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,2 @@ +* [Getting Started](./getting_started.md) +* [Available transports](./transports.md) diff --git a/docs/devel.adoc b/docs/devel.adoc deleted file mode 100644 index 1b6295662..000000000 --- a/docs/devel.adoc +++ /dev/null @@ -1,34 +0,0 @@ -### Code Design - * Model is based on Objects and not primitives that allows nullify requests and have null values for data - that wasn't provided by docker daemon. - * For null safeness findbugs annotations are used. - ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something) - should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package. - ** Methods that can't return `null` must be annotated with `@Nonnull`. - ** The same for Arguments. - ** `@Nullable` must be used only for changing inherited (other typed) qualifier. - * Setters in builder style must be prefixed with `withXX`. - * All classes should provide `toString()` `equals()` and `hashCode()` defined methods. - * Javadocs - ** Provide full information on field: - *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`. - ** getters/setters should refernce to field `@see #$field`. - * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`. - -### Coding style - * TBD, some initial styling already enforced with checkstyle. - IDEA/checkstyle file analogues will be provided soon. - -### Testing - * Unit tests for serder (serialization-deserialization). - * Integration tests for commands. - * If model object has builders, then fill it with data and compare by `equals()` with expected response - from docker daemon. If failed, then some fields mappings are wrong. - -### Debug - * When there are unreproducible Travis errors: - ** Try locally run test 10-20 times in IDE against the same docker daemon version and same connection type (tcp or socket). - ** Limit `.travis.yml` to single run (to not consume their resources with matrix run). - ** Remove `travis-logback.xml` replacement (build can't output everything in every run because travis has log limitation). - ** Set single test in `pom.xml` `for maven-failsafe-plugin` - ** Make PR or if you are maintainer push to branch, catch log and fix. diff --git a/docs/getting_started.md b/docs/getting_started.md new file mode 100644 index 000000000..7781e38ec --- /dev/null +++ b/docs/getting_started.md @@ -0,0 +1,129 @@ +# Getting Started + +## Dependencies + +To start using `docker-java` , you need to add at least two dependencies: +1. `com.github.docker-java:docker-java-core` for the `DockerClient` +1. one of `com.github.docker-java:docker-java-transport-*` to communicate with the Docker daemon. See [Available Transports](./transports.md) for more info. + +The latest available version: +[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) + + +## Instantiating a `DockerClientConfig` + +You will need an instance of `DockerClientConfig` to tell the library how to access Docker, which credentials to use to pull from Docker registries, etc etc. + +The builder is available and allows you to configure every property of the client: +```java +import com.github.dockerjava.core.DockerClientConfig +import com.github.dockerjava.core.DefaultDockerClientConfig +DockerClientConfig standard = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); +``` + +```java +import com.github.dockerjava.core.DockerClientConfig +import com.github.dockerjava.core.DefaultDockerClientConfig + +DockerClientConfig custom = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost("tcp://docker.somewhere.tld:2376") + .withDockerTlsVerify(true) + .withDockerCertPath("/home/user/.docker") + .withRegistryUsername(registryUser) + .withRegistryPassword(registryPass) + .withRegistryEmail(registryMail) + .withRegistryUrl(registryUrl) + .build(); +``` + +Here you can tune registry auth, DOCKER_HOST and other options. + +There are a couple of configuration items, all of which have sensible defaults: + +* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock` +* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol) +* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification +* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`) +* `api.version` The API version, e.g. `1.23`. +* `registry.url` Your registry's address. +* `registry.username` Your registry username (required to push containers). +* `registry.password` Your registry password. +* `registry.email` Your registry email. + +There are three ways to configure, in descending order of precedence: + +##### Properties (docker-java.properties) + + DOCKER_HOST=tcp://localhost:2376 + DOCKER_TLS_VERIFY=1 + DOCKER_CERT_PATH=/home/user/.docker/certs + DOCKER_CONFIG=/home/user/.docker + api.version=1.23 + registry.url=https://index.docker.io/v1/ + registry.username=dockeruser + registry.password=ilovedocker + registry.email=dockeruser@github.com + +##### System Properties: + + java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main + +##### System Environment + + export DOCKER_HOST=tcp://localhost:2376 + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH=/home/user/.docker/certs + export DOCKER_CONFIG=/home/user/.docker + +##### File System + +In `$HOME/.docker-java.properties` + +##### Class Path + +In the class path at `/docker-java.properties` + +### Jackson + +Should you need to customize the Jackson's `ObjectMapper` used by `docker-java`, you can create your own `DockerClientConfig` and override `DockerClientConfig#getObjectMapper()`. + +## Instantiating a `DockerHttpClient` +Once you decided which transport to use, you will need to instantiate an HTTP client: +```java +DockerClientConfig config = ...; + +DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .maxConnections(100) + .connectionTimeout(Duration.ofSeconds(30)) + .responseTimeout(Duration.ofSeconds(45)) + .build(); +``` + +Please refer to selected transport's builder for other available configuration options (like timeouts). + +Once you have an HTTP client, you can make raw requests to the Docker daemon directly: +```java +Request request = Request.builder() + .method(Request.Method.GET) + .path("/_ping") + .build(); + +try (Response response = httpClient.execute(request)) { + assertThat(response.getStatusCode(), equalTo(200)); + assertThat(IOUtils.toString(response.getBody()), equalTo("OK")); +} +``` + +## Instantiating a `DockerClient` + +To get an instance of `DockerClient`, you need to pass both `DockerClientConfig` and `DockerHttpClient`: +```java +DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); +``` + +Once you have it, you can start executing Docker commands: +```java +dockerClient.pingCmd().exec(); +``` diff --git a/docs/transports.md b/docs/transports.md new file mode 100644 index 000000000..18a93d9e0 --- /dev/null +++ b/docs/transports.md @@ -0,0 +1,74 @@ +# Available transports + +## Apache HttpClient 5 +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-httpclient5` | +| Stability | 🙂| +| Long term support plans | ✅ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +This transport is based on Apache HttpClient library version 5, which has a great flexibility and allows us to implement all Docker-specific features and protocols required, without having to use internal APIs or anything. + +It has everything to become the default transport of docker-java in future releases. + +## "Zerodep" +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-zerodep` | +| Stability | 🙂| +| Long term support plans | ✅ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +The idea of this transport is to provide a transport that supports 100% of the features without having to worry about transitive dependencies. + +Note: due to the implementation details, it cannot be true "0 dependencies" module, so it needs to depend on `slf4j-api` and JNA. + +## OkHttp +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-okhttp` | +| Stability | 🧐| +| Long term support plans | ❓ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +The OkHttp transport was first implemented in [the Testcontainers library](http://github.com/testcontainers/testcontainers-java) as a replacement for Netty. The main motivation for it was to not have heavy-weight Netty-specific native dependencies and the lack of Npipe support in the Netty one. + +OkHttp's migration to Kotlin and the need to use internal APIs for doing stdin hijacking makes us question the future of this transport (still under the consideration). + +## Netty +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-netty` | +| Stability | 🧐| +| Long term support plans | ❌ | +| Unix sockets support | ✅ | +| Windows Npipe support | ❌ | +| Stdin attachment support | ✅ | + +Netty was the first alternative transport introduced as an alternative to Jersey. + +Although it gives a very low level access to the protocol, the lack of Windows Npipe support and the native library dependency for Unix Sockets make it hard to maintain and there are no plans to continue including this transport option in future versions. + +The community may decide to pick it up and continue the development as a 3rd party transport based on the existing abstractions `docker-java` provides. + +## Jersey +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-jersey` | +| Stability | 🙃| +| Long term support plans | ❌ | +| Unix sockets support | ✅ | +| Windows Npipe support | ❌ | +| Stdin attachment support | ❌ | + +Jersey was the initial transport of the project. And, while working well, it was lacking support for connection hijacking (e.g. stdin attachment) or Windows Npipes. +The big amount of dependencies was also causing issues. + +Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed. diff --git a/mvnw b/mvnw new file mode 100755 index 000000000..bd8896bf2 --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 000000000..92450f932 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml index 556196fd6..51c06e2bc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,11 @@ - + 4.0.0 - - org.sonatype.oss - oss-parent - 9 - - com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -47,6 +42,11 @@ Konstantin Pelykh kpelykh@gmail.com + + bsideup + Sergei Egorov + bsideup@gmail.com + @@ -57,66 +57,84 @@ 1.8 1.8 - 2.27 - 2.9.8 - 2.9.8 - 4.5.6 - 1.19 - 1.11 - 2.6 - 2.6 - 1.7.25 + 2.47 + 4.5.12 + 1.28.0 + 2.21.0 + 3.19.0 + 1.7.30 - 1.60 - 2.2.0 - 19.0 + 1.82 + 2.10.1 + 33.4.8-jre 1.2.3 - 4.1.31.Final - 1.3 + 4.2.12.Final + 2.2 1.8 2.3.3 - 1.10.19 + 3.3.0 3.0.2 - 3.5.1 - 2.5.3 - 2.20 - 2.20 + 3.8.1 + 3.0.0-M1 + 3.0.0-M4 + 3.0.0-M4 1.8 1.1.2.RELEASE 3.0.0 + 1.6.8 docker-java-api + docker-java-bom docker-java-core + docker-java-transport + docker-java-transport-tck docker-java-transport-netty docker-java-transport-jersey + docker-java-transport-okhttp + docker-java-transport-httpclient5 + docker-java-transport-zerodep docker-java - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} + maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -128,6 +146,7 @@ ${jdk.target} ${jdk.debug} ${jdk.optimize} + true @@ -142,6 +161,13 @@ + + + + ${automatic.module.name} + + + @@ -193,49 +219,96 @@ org.apache.maven.plugins maven-javadoc-plugin 2.10.4 + + -Xdoclint:none + attach-javadocs jar - - -Xdoclint:none - + + org.apache.felix + maven-bundle-plugin + 4.2.1 + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.25.6 + + + + com.github.docker-java + ${project.artifactId} + 3.3.4 + jar + + + + + ${project.build.directory}/${project.artifactId}-${project.version}.jar + + + + true + public + true + + + METHOD_NEW_DEFAULT + true + true + + + METHOD_ABSTRACT_NOW_DEFAULT + true + true + + + + + + + verify + + cmp + + + + + + org.sonatype.central + central-publishing-maven-plugin + 0.10.0 + true + + central + docker-java-transport-tck + com.github.docker-java + + - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - release - deploy nexus-staging:release - + maven-source-plugin - org.apache.maven.plugins - maven-source-plugin + maven-javadoc-plugin + + org.sonatype.central + central-publishing-maven-plugin @@ -247,6 +320,13 @@ org.apache.maven.plugins maven-gpg-plugin + + + + --pinentry-mode + loopback + + sign-artifacts @@ -295,59 +375,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - Max - Low - true - - false - - - - - check - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.1 - - - - prepare-agent - - - - - post-unit-test - test - - report - - - - - pre-integration-test - pre-integration-test - - prepare-agent-integration - - - - report-integration - - report-integration - - - -