Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

codecov:
branch: master

Expand Down
2 changes: 2 additions & 0 deletions .drone.local.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

workspace:
base: /go
path: src/github.com/vmware/vic
Expand Down
2 changes: 2 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025


workspace:

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Copyright (c) HashiCorp, Inc.

name: Build and Run Tests

on:
Expand All @@ -13,7 +11,7 @@ jobs:

steps:
- name: Set up Go 1.x
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v6.1.0
with:
go-version: 1.8

Expand Down
2 changes: 2 additions & 0 deletions cmd/vic-machine-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

# Building:
# from vic root directory
# docker build --no-cache -t vic-machine-server -f cmd/vic-machine-server/Dockerfile .
Expand Down
2 changes: 2 additions & 0 deletions demos/compose/elk-app/docker-compose-elk.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2'
services:
vic-elasticsearch-1:
Expand Down
2 changes: 2 additions & 0 deletions demos/compose/voting-app/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "3"

services:
Expand Down
2 changes: 2 additions & 0 deletions demos/compose/webserving-app/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '3'

networks:
Expand Down
2 changes: 2 additions & 0 deletions infra/integration-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

# Building:
# cp -R /usr/lib/vmware-ovftool/ .
# docker build --no-cache -t vic-test -f Dockerfile .
Expand Down
4 changes: 4 additions & 0 deletions isos/vicadmin/auth.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!DOCTYPE html>
<!--
Copyright IBM Corp. 2016, 2025
-->

<html itemscope="" itemtype="http://schema.org/Organization" lang="en-US">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
Expand Down
4 changes: 4 additions & 0 deletions isos/vicadmin/css/clarity-ui.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions isos/vicadmin/css/fontello.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* Copyright IBM Corp. 2016, 2025
*/

@font-face {
font-family: 'fontello';
src: url('/fonts/fontello.eot?26878433');
Expand Down
4 changes: 4 additions & 0 deletions isos/vicadmin/css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* Copyright IBM Corp. 2016, 2025
*/

.main-nav .header {background-color: #004A70;}
.header .github {position: absolute; right:18px; top:6px;}
.header .logout {position: absolute; right:210px; top:6px}
Expand Down
4 changes: 4 additions & 0 deletions isos/vicadmin/dashboard.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!DOCTYPE html>
<!--
Copyright IBM Corp. 2016, 2025
-->

<!-- saved from url=(0030)http://10.20.232.35/community/ -->
<html itemscope="" itemtype="http://schema.org/Organization" lang="en-US">
<head>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

simple:
image: busybox:latest
command: ls
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

simple:
image: busybox:latest
container_name: my-web-container
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/depends_on/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

FROM busybox:latest
LABEL com.docker.compose.test_image=true
VOLUME /data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2'
services:
web:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

web:
image: busybox
command: /bin/true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

service:
image: busybox:latest
command: top
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/extends/circle-1.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

foo:
image: busybox
bar:
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/extends/circle-2.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

foo:
image: busybox
bar:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

web:
extends:
file: common.yml
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/extends/common.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

web:
image: busybox
command: /bin/true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
file: common.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2.1'
services:
demo:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2.1'
services:
demo:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

mydb:
build: '.'
myweb:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"
services:
myweb:
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/extends/invalid-net.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
build: '.'
extends:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
build: '.'
extends:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

webintermediate:
extends:
file: common.yml
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/extends/nested.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
file: nested-intermediate.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
service: web
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

dnebase:
build: nonexistent.path
command: /bin/true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

dnechild:
extends:
file: nonexistent-path-base.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

web:
image: busybox
extends:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
file: valid-composite-extends.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
build: '.'
extends:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
file: specify-file-as-self.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
build: '.'
extends:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

common-config:
environment:
- FOO=1
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Copyright IBM Corp. 2016, 2025

web:
command: top
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

web:
build: '.'
hostname: "host-${HOSTNAME_VALUE}"
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

myweb:
extends:
service: web
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

base:
image: busybox
environment:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2'
services:
myservice:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

simple:
image: busybox:latest
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

db:
image: busybox:latest
command: top
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/dockerfiles/configs/networks/bridge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"
networks:
default:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"
services:
simple:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"
services:
simple:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2.1"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: "2"

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '2.1'

services:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025


simple:
image: busybox:latest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

version: '3.2'
services:
simple:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright IBM Corp. 2016, 2025

simple:
image: busybox:latest
command:
Expand Down
Loading
Loading