Skip to content

Commit

Permalink
Merge pull request #43 from EpicMorg/develop
Browse files Browse the repository at this point in the history
February patch-2: Big rework of repositories on github
  • Loading branch information
stamepicmorg authored Feb 28, 2020
2 parents d7d5578 + 9a27d46 commit b5e58e2
Show file tree
Hide file tree
Showing 2,008 changed files with 548 additions and 90,998 deletions.
Binary file added .github/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,459 changes: 117 additions & 1,342 deletions .travis.yml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
## Changelog

* `February 2020`
* **Big rework of repositories on github**. Containers was Splited to another sub-repositories. Now current repo will be contain only fresh and latest versions of images. All older versions will be appeared in sub-repos. More fater building, less bad load to CI.
* `fixed` all `*.sh` chmods. (sorry)
* fixed `balancer` final container with `edge`.
* `websites` migrated to `edge`. why not?
* added `jdk6` and `jdk7` base images
* addded `PostgresSQL 9-12`
* `January 2020` (01/13/2020 - 01/30/2020)
* separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11`
* teamcity - `devel:jdk11`
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# [![Travis (.org)](https://img.shields.io/travis/EpicMorg/docker-scripts?style=flat-square)](https://travis-ci.org/EpicMorg/docker-scripts) [![Activity](https://img.shields.io/github/commit-activity/m/EpicMorg/docker-scripts?label=commits&style=flat-square)](https://github.com/EpicMorg/docker-scripts/commits) [![GitHub issues](https://img.shields.io/github/issues/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/issues) [![GitHub forks](https://img.shields.io/github/forks/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/network) [![GitHub stars](https://img.shields.io/github/stars/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/stargazers) [![Size](https://img.shields.io/github/repo-size/EpicMorg/docker-scripts?label=size&style=flat-square)](https://github.com/EpicMorg/docker-scripts/archive/master.zip) [![Release](https://img.shields.io/github/v/release/EpicMorg/docker-scripts?style=flat-square)](https://github.com/EpicMorg/docker-scripts/releases) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3658/badge)](https://bestpractices.coreinfrastructure.org/projects/3658) [![CodeScene System Mastery](https://codescene.io/projects/6535/status-badges/system-mastery)](https://codescene.io/projects/6535) [![GitHub license](https://img.shields.io/github/license/EpicMorg/docker-scripts.svg?style=popout-square)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md)


![](https://raw.githubusercontent.com/EpicMorg/docker-scripts/master/.github/logo.png)

## Quick navigation for sub-repositories



### Atlassian images
| Bitbucket | Confluence | Jira | EpicMorg |
|-------------:|:-------------:|:-----:|:-------|
| [![atlassian-bitbucket-6](https://img.shields.io/badge/Atlassian-Bitbucket%206-brightgreen?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-bitbucket-6) | [![confluence-7](https://img.shields.io/badge/Atlassian-Confluence%207-brightgreen?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-confluence-7) | [![atlassian-jira-8](https://img.shields.io/badge/Atlassian-Jira%208-brightgreen?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-jira-8) | [![PostgreSQL](https://img.shields.io/badge/EpicMorg-PostgreSQL%20Backports-yellow?style=popout-square)](https://github.com/EpicMorgVault/docker-postgres-backports) |
| ` ` | [![confluence-6](https://img.shields.io/badge/Atlassian-Confluence%206-yellow?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-confluence-6) | [![atlassian-jira-7](https://img.shields.io/badge/Atlassian-Jira%207-yellow?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-jira-7) | [![Experimental](https://img.shields.io/badge/EpicMorg-Deprecated-orange?style=popout-square)](https://github.com/EpicMorgVault/docker-experimental-images) |
| ` ` | [![confluence-5](https://img.shields.io/badge/Atlassian-Confluence%205-orange?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-confluence-5) | [![atlassian-jira-6](https://img.shields.io/badge/Atlassian-Jira%206-orange?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-jira-6) | [![Deprecated](https://img.shields.io/badge/EpicMorg-Experimental-red?style=popout-square)](https://github.com/EpicMorgVault/docker-deprecated-images) |
| ` ` | ` ` | [![atlassian-jira-5](https://img.shields.io/badge/Atlassian-Jira%205-red?style=popout-square)](https://github.com/EpicMorgVault/docker-atlassian-jira-5) | [![NextCloud](https://img.shields.io/badge/EpicMorg-NextCloud%20Backports-yellow?style=popout-square)](https://github.com/EpicMorgVault/docker-nextcloud-backports) | |


# Containers Map

![](https://raw.githubusercontent.com/EpicMorg/docker-scripts/master/.github/docker-scripts.png)
Expand Down
1 change: 0 additions & 1 deletion _deprecated/balancer/legacy/.docker-repository.yml

This file was deleted.

3 changes: 0 additions & 3 deletions _deprecated/balancer/legacy/.dockerignore

This file was deleted.

41 changes: 0 additions & 41 deletions _deprecated/balancer/legacy/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions _deprecated/balancer/legacy/Makefile

This file was deleted.

30 changes: 0 additions & 30 deletions _deprecated/balancer/legacy/README.md

This file was deleted.

1 change: 0 additions & 1 deletion _deprecated/staytus/.docker-repository.yml

This file was deleted.

3 changes: 0 additions & 3 deletions _deprecated/staytus/.dockerignore

This file was deleted.

30 changes: 0 additions & 30 deletions _deprecated/staytus/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions _deprecated/staytus/Makefile

This file was deleted.

37 changes: 0 additions & 37 deletions _deprecated/staytus/README.md

This file was deleted.

39 changes: 0 additions & 39 deletions _deprecated/staytus/entrypoint.sh

This file was deleted.

1 change: 0 additions & 1 deletion _experemental/ovm/.docker-repository.yml

This file was deleted.

3 changes: 0 additions & 3 deletions _experemental/ovm/.dockerignore

This file was deleted.

50 changes: 0 additions & 50 deletions _experemental/ovm/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions _experemental/ovm/Makefile

This file was deleted.

30 changes: 0 additions & 30 deletions _experemental/ovm/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions _experemental/ovm/container.ini

This file was deleted.

Loading

0 comments on commit b5e58e2

Please sign in to comment.